Fixed broken refactoring (!)