bad refactoring fix