fixed too eager return