Nothing like refactoring to break stuff 🙂