Removed overly conservative check