Lexicon bugfix 2