fix broken commenting (due to overlapping elements) [Finishes #71049970]