diff --git a/Docs/src/history.but b/Docs/src/history.but
index 45ffb49b..ff441570 100644
--- a/Docs/src/history.but
+++ b/Docs/src/history.but
@@ -12,6 +12,8 @@ Released on ?, 2013
 
 \S2{} Minor Changes
 
+\b Fixed !finalize %1
+
 \b Fixed !searchparse
 
 \b Minor MakeNSISW fixes and tweaks
diff --git a/Source/build.cpp b/Source/build.cpp
index e898a822..ff19264a 100644
--- a/Source/build.cpp
+++ b/Source/build.cpp
@@ -2954,7 +2954,7 @@ int CEXEBuild::write_output(void)
           ERROR_MSG(_T("Error: can't allocate memory for finalize command\n"));
           return PS_ERROR;
         }
-        *((UINT_PTR*)&arg) -= (UINT_PTR)cmdstr, *((UINT_PTR*)&arg) += (UINT_PTR)cmdstrbuf;
+        *((unsigned char**)&arg) -= (UINT_PTR)cmdstr, *((unsigned char**)&arg) += (UINT_PTR)cmdstrbuf;
         _tcscpy(cmdstrbuf,cmdstr);
         cmdstr = cmdstrbuf;
         memmove(arg+cchbldoutfile, arg+2, (_tcslen(arg+2)+1)*sizeof(TCHAR));