Fix N-form builder