Removed potentially breaking check