Actually I added that check because there was a failing test, so I think we should keep it.