Get rid of legacy inconsistency