Fixed NS validation