FederationFactory fix