diff --git a/ChangeLog b/ChangeLog
index 030bf6305..6bbdf0ec5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-31  Werner Lemberg  <wl@gnu.org>
+
+	Fix Savannah bug #37000.
+
+	* src/type1/t1load.c (parse_encoding): Fix order of checks.
+
 2012-07-17  Werner Lemberg  <wl@gnu.org>
 
 	Fix Savannah bug #36833.
diff --git a/src/type1/t1load.c b/src/type1/t1load.c
index 608496a13..4b4217cea 100644
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@@ -1284,7 +1284,7 @@
 
           cur = parser->root.cursor;
 
-          if ( *cur == '/' && cur + 2 < limit && n < count )
+          if ( cur + 2 < limit && *cur == '/' && n < count )
           {
             FT_PtrDist  len;