Oops refactor bug