Small logic change