[FIXUP] Fix markers disappearing after moving.