Fixed condition check