Use more granular shortcut check, 0.8.1