Little logic change