Fixed #17 keystrokes