diff --git a/demo/rawfb/sdl/demo b/demo/rawfb/sdl/demo
index 8fbb9d69f..7dfb812be 100755
Binary files a/demo/rawfb/sdl/demo and b/demo/rawfb/sdl/demo differ
diff --git a/demo/rawfb/x11/bin/demo b/demo/rawfb/x11/bin/demo
index 7b2c6eea0..ec5f98865 100755
Binary files a/demo/rawfb/x11/bin/demo and b/demo/rawfb/x11/bin/demo differ
diff --git a/nuklear.h b/nuklear.h
index 8c3fea994..a1deca76a 100644
--- a/nuklear.h
+++ b/nuklear.h
@@ -17230,7 +17230,7 @@ nk_font_bake_convert(void *out_memory, int img_width, int img_height,
     const void *in_memory)
 {
     int n = 0;
-    nk_rune *dst;
+    nk_byte *dst;
     const nk_byte *src;
 
     NK_ASSERT(out_memory);
@@ -17239,10 +17239,14 @@ nk_font_bake_convert(void *out_memory, int img_width, int img_height,
     NK_ASSERT(img_height);
     if (!out_memory || !in_memory || !img_height || !img_width) return;
 
-    dst = (nk_rune*)out_memory;
+    dst = (nk_byte*)out_memory;
     src = (const nk_byte*)in_memory;
-    for (n = (int)(img_width * img_height); n > 0; n--)
-        *dst++ = ((nk_rune)(*src++) << 24) | 0x00FFFFFF;
+    for (n = (int)(img_width * img_height); n > 0; n--) {
+        *dst++ = 0xff;  /* r */
+        *dst++ = 0xff;  /* g */
+        *dst++ = 0xff;  /* b */
+        *dst++ = *src++;  /* a */
+    }
 }
 
 /* -------------------------------------------------------------
diff --git a/src/nuklear_font.c b/src/nuklear_font.c
index 8688af2f9..ed1a8e811 100644
--- a/src/nuklear_font.c
+++ b/src/nuklear_font.c
@@ -423,7 +423,7 @@ nk_font_bake_convert(void *out_memory, int img_width, int img_height,
     const void *in_memory)
 {
     int n = 0;
-    nk_rune *dst;
+    nk_byte *dst;
     const nk_byte *src;
 
     NK_ASSERT(out_memory);
@@ -432,10 +432,14 @@ nk_font_bake_convert(void *out_memory, int img_width, int img_height,
     NK_ASSERT(img_height);
     if (!out_memory || !in_memory || !img_height || !img_width) return;
 
-    dst = (nk_rune*)out_memory;
+    dst = (nk_byte*)out_memory;
     src = (const nk_byte*)in_memory;
-    for (n = (int)(img_width * img_height); n > 0; n--)
-        *dst++ = ((nk_rune)(*src++) << 24) | 0x00FFFFFF;
+    for (n = (int)(img_width * img_height); n > 0; n--) {
+        *dst++ = 0xff;  /* r */
+        *dst++ = 0xff;  /* g */
+        *dst++ = 0xff;  /* b */
+        *dst++ = *src++;  /* a */
+    }
 }
 
 /* -------------------------------------------------------------