Fix shortname bug