0.5.1 Client bug fix