diff --git a/src/common/PJoystickHandler.cxx b/src/common/PJoystickHandler.cxx
index 2003cbe27..1a35cef63 100644
--- a/src/common/PJoystickHandler.cxx
+++ b/src/common/PJoystickHandler.cxx
@@ -265,7 +265,6 @@ bool PhysicalJoystickHandler::mapStelladaptors(const string& saport, int ID)
       erased = true;
     }
 
-    //if(BSPF::startsWithIgnoreCase(_stick->name, "Stelladaptor"))
     if(BSPF::containsIgnoreCase(_stick->name, "Stelladaptor"))
     {
       if(saOrder[saCount] == 1)
@@ -274,8 +273,7 @@ bool PhysicalJoystickHandler::mapStelladaptors(const string& saport, int ID)
         _stick->type = PhysicalJoystick::Type::RIGHT_STELLADAPTOR;
       found = true;
     }
-    else //if(BSPF::startsWithIgnoreCase(_stick->name, "2600-daptor"))
-      if(BSPF::containsIgnoreCase(_stick->name, "2600-daptor"))
+    else if(BSPF::containsIgnoreCase(_stick->name, "2600-daptor"))
     {
       if(saOrder[saCount] == 1)
         _stick->type = PhysicalJoystick::Type::LEFT_2600DAPTOR;
@@ -310,8 +308,8 @@ bool PhysicalJoystickHandler::hasStelladaptors() const
     if(pos != std::string::npos)
       _joyptr->name.erase(pos);
 
-    if(BSPF::startsWithIgnoreCase(_joyptr->name, "Stelladaptor")
-       || BSPF::startsWithIgnoreCase(_joyptr->name, "2600-daptor"))
+    if(BSPF::containsIgnoreCase(_joyptr->name, "Stelladaptor")
+       || BSPF::containsIgnoreCase(_joyptr->name, "2600-daptor"))
       return true;
   }
   return false;