Making it harder for share_mode_entries to be left with