Fix for new namespacing
Fix for new namespacing