Fix for namespaces