Fix recipients routing