Fixes #228 Bookmarks appear to be unreliable.