Fix marker bug