fixes namespace issues