fix client map issue