Correcting ting-client branch