Refactoring gone wrong, flipped condition #397