Without the if/else, a bajillion tests fail. :/