Move the check into dependent call