diff --git a/src/type1/t1cmap.c b/src/psaux/t1cmap.c
similarity index 99%
rename from src/type1/t1cmap.c
rename to src/psaux/t1cmap.c
index 85ef79b0c..d33b84ca5 100644
--- a/src/type1/t1cmap.c
+++ b/src/psaux/t1cmap.c
@@ -73,9 +73,8 @@
                          FT_UInt32   *pchar_code )
   {
     FT_UInt   result    = 0;
-    FT_UInt32 char_code = *pchar_code;
+    FT_UInt32 char_code = *pchar_code + 1;
 
-    ++char_code;
     while ( char_code < 256 )
     {
       result = t1_cmap_standard_char_index( cmap, char_code );
@@ -409,6 +408,3 @@
     t1_cmap_unicode_char_index,
     t1_cmap_unicode_char_next
   };
-
-
-  
\ No newline at end of file
diff --git a/src/type1/t1cmap.h b/src/psaux/t1cmap.h
similarity index 100%
rename from src/type1/t1cmap.h
rename to src/psaux/t1cmap.h