Fixed a bug in lexer, but there is another one around ...