diff --git a/src/Skini.cpp b/src/Skini.cpp
index 3df6869..8c41a09 100644
--- a/src/Skini.cpp
+++ b/src/Skini.cpp
@@ -153,10 +153,13 @@ long Skini :: parseString( std::string& line, Message& message )
 
   // Parse the remaining fields (maximum of 2 more).
   int iValue = 0;
+  unsigned int iToken = iValue + 3; //rgh: MIDI extension argument counts are different from regular MIDI
   long dataType = skini_msgs[iSkini].data2;
   while ( dataType != NOPE ) {
 
-    if ( tokens.size() <= (unsigned int) (iValue+3) ) {
+//    if ( tokens.size() <= (unsigned int) (iValue+3) ) { //rgh: test iToken rather than always testing iValue+3
+//    if (tokens.size() <= iToken) { //rgh: iToken only tests it more tokens are to be consumed (SK_INT, SK_DBL, SK_STR)
+	  if ((tokens.size() <= iToken) && (dataType < 0))  { //Don't fail if remaining iValues come from skini_msgs[] rather than tokens[].
       oStream_ <<  "Skini::parseString: inconsistency between type table and parsed line:\n   " << line;
       handleError( StkError::WARNING );
       return message.type = 0;
@@ -165,23 +168,25 @@ long Skini :: parseString( std::string& line, Message& message )
     switch ( dataType ) {
 
     case SK_INT:
-      message.intValues[iValue] = atoi( tokens[iValue+3].c_str() );
+      message.intValues[iValue] = atoi( tokens[iToken].c_str() ); //rgh: use new index
       message.floatValues[iValue] = (StkFloat) message.intValues[iValue];
+      ++iToken; //rgh: increment token index and value index (below)
       break;
 
     case SK_DBL:
-      message.floatValues[iValue] = atof( tokens[iValue+3].c_str() );
+      message.floatValues[iValue] = atof( tokens[iToken].c_str() ); //rgh: use new index
       message.intValues[iValue] = (long) message.floatValues[iValue];
+      ++iToken; //rgh: increment token index and value index (below)
       break;
 
     case SK_STR: // Must be the last field.
-      message.remainder = tokens[iValue+3];
+      message.remainder = tokens[iToken]; //rgh: use new index
       return message.type;
 
     default: // MIDI extension message
       message.intValues[iValue] = dataType;
       message.floatValues[iValue] = (StkFloat) message.intValues[iValue];
-      iValue--;
+      //iValue--; //rgh: iValue must increment even when iToken does not; resetting iValue only works sometimes
     }
 
     if ( ++iValue == 1 )