Put back the check for the entry type