ClientMap issue #537 testcase