diff --git a/ChangeLog b/ChangeLog
index 6ce0c2030..620cebc24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-11-01  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	* src/smooth/ftgrays.c (gray_set_cell): Fix uninitialized variables.
+
 2017-11-03  Ewald Hew  <ewaldhew@gmail.com>
 
 	[psaux] Fix PostScript interpreter rewinding in Type 1 mode. (#52251)
diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c
index 91ca6e339..3b3dcb31e 100644
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -582,8 +582,8 @@ typedef ptrdiff_t  FT_PtrDist;
     if ( ex < ras.min_ex )
       ex = ras.min_ex - 1;
 
-    /* record the current one if it is substantial and valid */
-    if ( ( ras.area || ras.cover ) && !ras.invalid )
+    /* record the current one if it is valid and substantial */
+    if ( !ras.invalid && ( ras.area || ras.cover ) )
       gray_record_cell( RAS_VAR );
 
     ras.area  = 0;