Commited #455 after modification client mode bug.