Possibly fixed section 9 code