Fix issue with the Form generator.