fix broken build, namespace fiasco
merge commit