solve duplicate on the client issue #23