Fix for lex matching