Fixes #626
Merge pull request #629 from Dynious/calcinatorFix

Fixes #626