temporary fix for #12, need to make shortcut work again