diff --git a/ChangeLog b/ChangeLog
index 374881eb9..bc086cd20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-08-30  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	* src/base/ftobjs.c (ft_glyphslot_preset_bitmap): Check glyph format.
+
 2018-08-31  Armin Hasitzka  <prince.cherusker@gmail.com>
 
 	[errors] Refine the macro logic surrounding `FT_Error_String'.
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 7997b675f..f3d82992b 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -361,8 +361,8 @@
     FT_Pos   width, height, pitch;
 
 
-    if ( slot->internal && ( slot->internal->flags & FT_GLYPH_OWN_BITMAP ) )
-      return;
+    if ( slot->format != FT_GLYPH_FORMAT_OUTLINE )
+      return 1;
 
     if ( origin )
     {