diff --git a/ChangeLog.txt b/ChangeLog.txt
index c1b926e756..bd85f180e2 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,10 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2017-03-20 00:58 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
+  * src/compile/hbopt.c
+    ! fixed 'assigned but not used' error detection for 'var op= val' code
+
 2017-03-15 14:39 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * include/hbdefs.h
     + added macros HB_CAST_*( double ) for conversions of double values
diff --git a/src/compiler/hbopt.c b/src/compiler/hbopt.c
index d4f697c71b..80ac67f758 100644
--- a/src/compiler/hbopt.c
+++ b/src/compiler/hbopt.c
@@ -1452,7 +1452,6 @@ static void hb_compPCodeEnumAssignedUnused( HB_COMP_DECL, PHB_HFUNC pFunc, PHB_O
              pLocals[ isLocal - 1 ].bFlags != ( OPT_LOCAL_FLAG_PUSH | OPT_LOCAL_FLAG_POPSELF ) )
          {
             memset( pMap, 0, pFunc->nPCodePos );
-            pMap[ nPos ] = 1;
 
             if( ! hb_compPCodeTraceAssignedUnused( pFunc, nPos + hb_compPCodeSize( pFunc, nPos ),
                                                    pMap, isLocal, HB_FALSE ) )