fix Issue 11723 - Too many "integer overflow" errors
Merge pull request #2948 from 9rnsr/fix11723

[REG2.065a] Issue 11723 - Too many "integer overflow" errors