diff --git a/libs/pigment/compositeops/KoCompositeOpFunctions.h b/libs/pigment/compositeops/KoCompositeOpFunctions.h
index f3e9e46cfb..8a2d3da9b6 100644
--- a/libs/pigment/compositeops/KoCompositeOpFunctions.h
+++ b/libs/pigment/compositeops/KoCompositeOpFunctions.h
@@ -496,10 +496,6 @@ inline T cfHeat(T src, T dst) {
         return unitValue<T>();
     }
 
-    if(src == unitValue<T>()) {
-        return unitValue<T>();
-    }
-
     if(dst == zeroValue<T>()) {
         return zeroValue<T>();
     }
@@ -542,10 +538,6 @@ inline T cfFrect(T src, T dst) {
         return zeroValue<T>();
     }
 
-    if (dst == zeroValue<T>()) {
-        return zeroValue<T>();
-    }
-
     return (cfReflect(src,dst));
 }
 
@@ -620,14 +612,18 @@ inline T cfPenumbraB(T src, T dst) {
 template<class T>
 inline T cfPenumbraD(T src, T dst) {
     using namespace Arithmetic;
-
+    
+    if (dst == unitValue<T>()) {
+        return unitValue<T>();
+    }
+    
     return cfArcTangent(src,inv(dst));
 }
 
 template<class T>
 inline T cfPenumbraC(T src, T dst) {
     using namespace Arithmetic;
-
+    
     return cfPenumbraD(dst,src);
 }