Fix the instance id's miss-matching issue