Fixed bug with indirect clients