Made federation work again