Fix the form builder once more