fixed shortcut issue