Refactor, and I broke it!