returning client fix