Fix bad condition encapsulation