diff --git a/src/Font.cpp b/src/Font.cpp
index 36823923..2c23a912 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -1078,8 +1078,8 @@ FontObject* LoadFontFromData(const unsigned char *data, size_t data_size, unsign
 
 					font_object->glyph_list_head = NULL;
 
-					size_t atlas_entry_width = (font_object->face->bbox.xMax - font_object->face->bbox.xMin) >> 6;
-					size_t atlas_entry_height = (font_object->face->bbox.yMax - font_object->face->bbox.yMin) >> 6;
+					size_t atlas_entry_width = FT_MulFix(font_object->face->bbox.xMax - font_object->face->bbox.xMin, font_object->face->size->metrics.x_scale) / 64;
+					size_t atlas_entry_height = FT_MulFix(font_object->face->bbox.yMax - font_object->face->bbox.yMin, font_object->face->size->metrics.y_scale) / 64;
 
 					font_object->atlas_row_length = ceil(sqrt(atlas_entry_width * atlas_entry_height * TOTAL_GLYPH_SLOTS) / atlas_entry_width);