Fixed bug in federator
Fixed bug in federator