Fixes overflow issue