Fix marker issue