Fix a bug when generating client subscription list