Fix for multi level namespaces