fix to new namespaces