Fixing lexical analysis.