need to fix the shortcut key problem