Merge "fix get ns bug"