Nested form fix