Fixing lexing a bit