Fixed NS check vs numver of values