Fix issue on undefined shortName