diff --git a/src/Core/utf8_iterator.hpp b/src/Core/utf8_iterator.hpp
index abf5671..fd490f4 100644
--- a/src/Core/utf8_iterator.hpp
+++ b/src/Core/utf8_iterator.hpp
@@ -58,7 +58,7 @@ namespace Fig
             switch (len)
             {
                 case 1:
-                    code_point = char_data_[0];
+                    code_point = static_cast<char32_t>(char_data_[0]);
                     break;
                 case 2:
                     code_point = ((char_data_[0] & 0x1F) << 6) | (char_data_[1] & 0x3F);