diff --git a/Doc/Manual/Typemaps.html b/Doc/Manual/Typemaps.html
index 3990e43e2..78844618c 100644
--- a/Doc/Manual/Typemaps.html
+++ b/Doc/Manual/Typemaps.html
@@ -2456,8 +2456,8 @@ The result is the following expansion
 </div>
 
 <p>
-The first argument, the typemap method, can look up the keyword argument of a
-typemap by appending a colon and the keyowrd. For example,
+The first argument, the typemap method, can look up the attribute of a
+typemap by appending a colon and the keyword. For example,
 <tt>$typemap(directorin:descriptor, $type)</tt>  would be replaced by <tt>"D"</tt> if <tt>type</tt> is a <tt>double</tt>.
 </p>
 <p>
diff --git a/Source/Swig/typemap.c b/Source/Swig/typemap.c
index 0ff109273..f19daf280 100644
--- a/Source/Swig/typemap.c
+++ b/Source/Swig/typemap.c
@@ -2105,7 +2105,7 @@ static void replace_embedded_typemap(String *s, ParmList *parm_sublist, Wrapper
 	      Printf(stdout, "  Containing: %s\n", dtypemap);
 	      Delete(dtypemap);
 	    }
-	    found_colon = Strstr(tmap_method, ":");
+	    found_colon = Strchr(tmap_method, ':');
 	    if (found_colon) {
 	      String *temp_tmap_method = NewStringWithSize(Char(tmap_method), found_colon - Char(tmap_method));
 	      Swig_typemap_attach_parms(temp_tmap_method, to_match_parms, f);