corrected shortcut handling