Merge pull request #1925 from nabinhait/hotfix

Overflow validation fixed