ticket:4 client fix