Fixed overflow problem #34