Fixed an issue where one-time key events would not properly trigger