Fixed marker listener problems