fixes #1238 client map interceptor