Refactor
Shortcut bugfix

fixes #10