Redo a bit clean section handling to cover one more case.