fixed yada condition check