Fixing the issue when deduping the namespace