Fix for incorrect bookmarks