Removed excessive check