Fix an issue with getting shortname