CC: don't forget to handle shortcut