Fix the markers, [finishes #64164546]