Fix marker/moving