World Marker bug fix