Fix an overflow problem now!