Attempt at fixing lexer mix ups