Fixed lex bug from condition re-order