CA-149235: Fixed by adjusting the locations for Ja and ZHCN