diff --git a/RetroFE/Source/Control/InputHandler.h b/RetroFE/Source/Control/InputHandler.h
index 9996d4b..8ef88da 100644
--- a/RetroFE/Source/Control/InputHandler.h
+++ b/RetroFE/Source/Control/InputHandler.h
@@ -5,6 +5,7 @@
 class InputHandler
 {
 public:
+    virtual ~InputHandler() {};
     virtual bool update(SDL_Event &e) = 0;
     virtual bool pressed() = 0;
     virtual void reset() = 0;
diff --git a/RetroFE/Source/Control/UserInput.cpp b/RetroFE/Source/Control/UserInput.cpp
index 5002767..fc61d28 100644
--- a/RetroFE/Source/Control/UserInput.cpp
+++ b/RetroFE/Source/Control/UserInput.cpp
@@ -36,6 +36,14 @@ UserInput::UserInput(Configuration &c)
 
 UserInput::~UserInput()
 {
+    for (unsigned int i = 0; i < keyHandlers_.size(); ++i)
+    {
+        if (keyHandlers_[i].first)
+        {
+            delete keyHandlers_[i].first;
+        }
+    }
+
 // This code causes an exception when a controller is attached; it's disabled to prevent crashes on exit.
 //    for(std::vector<SDL_Joystick *>::iterator it = joysticks_.begin(); it != joysticks_.end(); it++)
 //    {
diff --git a/RetroFE/Source/Control/UserInput.h b/RetroFE/Source/Control/UserInput.h
index c08257d..25bec1d 100644
--- a/RetroFE/Source/Control/UserInput.h
+++ b/RetroFE/Source/Control/UserInput.h
@@ -64,7 +64,7 @@ private:
     bool MapKey(std::string keyDescription, KeyCode_E key, bool required);
     Configuration &config_;
     std::vector<SDL_Joystick *> joysticks_;
-    std::vector<std::pair<InputHandler *, KeyCode_E>> keyHandlers_;
+    std::vector<std::pair<InputHandler *, KeyCode_E> > keyHandlers_;
     bool lastKeyState_[KeyCodeMax]; 
     bool currentKeyState_[KeyCodeMax]; 
 };