fixed issue with namespacing