This conditional shouldn't be necessary?