fixing Namespace issues