Fix subsection handling