Fixes namespacing issue