Completely removed the check