Fixed issue with unsigned overflow
Fixed issue with unsigned overflow