client 1.6 -> 1.7