Checkpoint for server
Fix bug in client