diff --git a/src/Makefile b/src/Makefile
index d9812416..e822c4a4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -330,9 +330,9 @@ endif
 export LIB
 
 ifeq ($(DEBUG),1)
-  CFLAGS +=
+  CFLAGS += -Od -d
 else
-  CFLAGS += -O2
+  CFLAGS += -O2 -d
 endif
 
 LINK_EXE = $(CC) $(LDFLAGS) -e$@ $^ $(LDLIBS)
diff --git a/src/p_w32pe.cpp b/src/p_w32pe.cpp
index 3eef6e0f..8990fc9f 100644
--- a/src/p_w32pe.cpp
+++ b/src/p_w32pe.cpp
@@ -1315,7 +1315,7 @@ void PackW32Pe::processResources(Resource* res)
         memset(ibuf + res->offs(),FILLVAL,res->size());
         res->newoffs() = ptr_diff(ores,oresources);
         if (rtype == 3)
-            compress_icon = iconcnt++ >= iconsin1stdir || opt->w32pe.compress_icons == 1;
+            compress_icon = iconcnt++ > iconsin1stdir || opt->w32pe.compress_icons == 1;
         else if (rtype == 14)
         {
             if (opt->w32pe.compress_icons == 1)