Fixed overflow problem