fixing hardcoded namespace check.