resolves issues with namespaces
resolves issues with namespaces