Removed wrong checking