Fix "loosing bookmarks" bug