Bug fixe for form issue