CLIENT wrong parsing fix