Fixed ns bug