Fix one more form builder