new fix for form creation