Correct bad refactor