Fixed marker issue