Fixed visibility issued casued by NS changes