fix some hackery about subscription id in client