diff --git a/toonz/sources/tnztools/filltool.cpp b/toonz/sources/tnztools/filltool.cpp
index 9682e63f..05243503 100644
--- a/toonz/sources/tnztools/filltool.cpp
+++ b/toonz/sources/tnztools/filltool.cpp
@@ -1051,15 +1051,13 @@ void fillAreaWithUndo(const TImageP &img, const TRectD &area, TStroke *stroke,
     for (int tempY = 0; tempY < tempRaster->getLy(); tempY++) {
       for (int tempX = 0; tempX < tempRaster->getLx();
            tempX++, tempPix++, keepPix++) {
-        if (tempPix->getInk() >= IGNORECOLORSTYLE ||
-            tempPix->getPaint() >= IGNORECOLORSTYLE) {
-          continue;
-        } else {
-          // Handle all other pixels
+        if (tempPix->getInk() < IGNORECOLORSTYLE) {
           keepPix->setInk(tempPix->getInk());
-          keepPix->setPaint(tempPix->getPaint());
-          keepPix->setTone(tempPix->getTone());
         }
+        if (tempPix->getPaint() < IGNORECOLORSTYLE) {
+          keepPix->setPaint(tempPix->getPaint());
+        }
+        keepPix->setTone(tempPix->getTone());
       }
     }
 
diff --git a/toonz/sources/toonzlib/fillutil.cpp b/toonz/sources/toonzlib/fillutil.cpp
index 9bd77d29..2010a6ed 100644
--- a/toonz/sources/toonzlib/fillutil.cpp
+++ b/toonz/sources/toonzlib/fillutil.cpp
@@ -99,8 +99,9 @@ void restoreColors(const TRasterCM32P &r,
   // in order to make the paint to protrude behind the line
   params.m_prevailing = false;
   for (UINT i = 0; i < seeds.size(); i++) {
-    params.m_p       = seeds[i].first;
-    params.m_styleId = seeds[i].second;
+    params.m_p = seeds[i].first;
+    // params.m_styleId = seeds[i].second;
+    params.m_styleId = IGNORECOLORSTYLE;
     fill(r, params);
   }
 }