Fixed condition issue