fix_empty_entry_issue