Client bug fix