Fixing passing of condition