Fixing namespace problem