follow logic fix