Fix shortcut creation