Fixed an issue in client