bug fix in form builder