another namespace fix
bugfixes