Fix for form elements wrapped with the form name