Why is this check needed now when it wasn't before?