Adding fix for nested form fields