Fixed broken client