Fixing issue with negative numbers,  though make code faster.
// wont fix in dev, already fixed
Revert "Fixing issue with negative numbers,  though make code faster."

This reverts commit 608fde0fed40599dd0a97fc1051f9ac765b38054.
Merge branch 'hotfix-1' into development