FormGen fix