Bug fix with namespace.