samurai dummy client
Fix bug