#105 hotfix for global namespace