fix nested forms