Next condition check fix