Improved getShortcut() return