Comment 4 for bug 1421608

It might be a bug related to something I fixed some days ago. I will link the branch to this bug and we will see if it fixes the bug after merging the branch into pantheon-calculator. Hopefully we will sort this out :) If not, I will investigate this issue again.