Fix for reorganised namespaces