diff --git a/src/core/CL/kernels/CLMagnitudePhaseKernel.cpp b/src/core/CL/kernels/CLMagnitudePhaseKernel.cpp
index 354113b..0af7386 100644
--- a/src/core/CL/kernels/CLMagnitudePhaseKernel.cpp
+++ b/src/core/CL/kernels/CLMagnitudePhaseKernel.cpp
@@ -161,16 +161,8 @@
         unsigned int idx = 0;
         add_2D_tensor_argument(idx, _gx, slice);
         add_2D_tensor_argument(idx, _gy, slice);
-
-        if(_run_mag)
-        {
-            add_2D_tensor_argument(idx, _magnitude, slice);
-        }
-
-        if(_run_phase)
-        {
-            add_2D_tensor_argument(idx, _phase, slice);
-        }
+        add_2D_tensor_argument_if((_run_mag), idx, _magnitude, slice);
+        add_2D_tensor_argument_if((_run_phase), idx, _phase, slice);
 
         enqueue(queue, *this, slice, lws_hint());
     }