This is how it should be - waiting for Lexicon fix on this one