Corrected c1-12 issues