Lexicon bugfix