fix to latest namespaces changes