Hotfix namespace issue