Broken refactoring
Broken refactoring