fix forms generation