fixing lexical analysis