ManagedForm fix