Merge pull request #3118 from kumpera/fix_getname