fix: correctly wrapp client code