form handling fix