diff --git a/src/mbyte.c b/src/mbyte.c
index 7fdd44dc32..b896477fce 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -4325,7 +4325,8 @@ get_iconv_import_func(HINSTANCE hInst, const char *funcname)
 	{
 	    if (IMAGE_SNAP_BY_ORDINAL(pINT->u1.Ordinal))
 		continue;
-	    pImpName = (PIMAGE_IMPORT_BY_NAME)(pImage + pINT->u1.AddressOfData);
+	    pImpName = (PIMAGE_IMPORT_BY_NAME)(pImage
+					+ (UINT_PTR)(pINT->u1.AddressOfData));
 	    if (strcmp(pImpName->Name, funcname) == 0)
 		return (void *)pIAT->u1.Function;
 	}
diff --git a/src/version.c b/src/version.c
index 3e7d4639ee..073c294edd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    778,
 /**/
     777,
 /**/