0e40315 Fixes overflow issue