fix shortcut usage
Merge branch 'fix-shortcut'