Fixed overzealous overflow