close #466 on the client side