Fix has_marker heuristic