Fixes NS issue