Removed possible broken validation