Fix issue with multiple (unnecessary) namespaces