fix handing of shortname