diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx
index 87b1e318e..d2e384e37 100644
--- a/src/emucore/Console.cxx
+++ b/src/emucore/Console.cxx
@@ -587,7 +587,7 @@ void Console::setControllers(const string& rommd5)
   // creates them for us, and also that they must be used in both ports
   if(left == "COMPUMATE" || right == "COMPUMATE")
   {
-    myCMHandler = make_shared<CompuMate>(*this, myEvent, *mySystem);
+    myCMHandler = make_ptr<CompuMate>(*this, myEvent, *mySystem);
 
     // A somewhat ugly bit of code that casts to CartridgeCM to
     // add the CompuMate, and then back again for the actual
diff --git a/src/emucore/Console.hxx b/src/emucore/Console.hxx
index 0528987d8..3719a53c0 100644
--- a/src/emucore/Console.hxx
+++ b/src/emucore/Console.hxx
@@ -349,7 +349,7 @@ class Console : public Serializable
     unique_ptr<Controller> myLeftControl, myRightControl;
 
     // Pointer to CompuMate handler (only used in CompuMate ROMs)
-    shared_ptr<CompuMate> myCMHandler;
+    unique_ptr<CompuMate> myCMHandler;
 
     // The currently defined display format (NTSC/PAL/SECAM)
     string myDisplayFormat;