condition check fix