Fixed cform bug