Duh, refactoring fail