teiiddes-1647: Corrected the default ns logic.