diff --git a/Docs/src/history.but b/Docs/src/history.but
index eba90b45..fc32fa41 100644
--- a/Docs/src/history.but
+++ b/Docs/src/history.but
@@ -18,6 +18,8 @@ Unicode is the now default.
 
 \b Added nsExec /MBCS switch
 
+\b Fixed Unicode compiler crash (\W{http://sf.net/p/nsis/bugs/1254}{bug #1254}, \W{http://sf.net/p/nsis/patches/300}{patch #300})
+
 \S2{} Translations
 
 \b Updated Corsican\#{(forum)} and Japanese (maboroshin PR\#{github.com/maboroshin})
diff --git a/Source/strlist.cpp b/Source/strlist.cpp
index d299f5d7..bb45e9e1 100644
--- a/Source/strlist.cpp
+++ b/Source/strlist.cpp
@@ -43,7 +43,7 @@ unsigned int ExeHeadStringList::getnum() const
     for(;;)
     {
       if ((pos+=cb) >= cbList) break;
-      cb = StrLenUTF16(p+=cb) + 1, ++num;
+      cb = (StrLenUTF16(p+=cb) + 1) * 2, ++num;
     }
   }
   else