Fix for Issue #1

Fox for the integer overflow.