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

Fixes #626
Fixed #626 with stack sizes > 1
Merge pull request #630 from Dynious/calcinatorFix

Fixed #626 with stack sizes > 1