Fix entry type bug