Fix for problem warping to bookmarks