Part 1 of fix for unread entries.