[FIX] Marker bug