Fix marker getter logic