Fixed for Lex

To be squashed