Fixing NS bug in previous version, 0.3.7