Fixing another namespace problem