added shortcut fix