Fix #61 of client