diff --git a/CEP/DP3/AOFlagger/include/AOFlagger/msio/timefrequencydata.h b/CEP/DP3/AOFlagger/include/AOFlagger/msio/timefrequencydata.h
index 72ed9aeeb017e887d499c7316a3786ca7f6a01f1..1821ebca3f0fb67a8ab3e0480482af017f76b776 100644
--- a/CEP/DP3/AOFlagger/include/AOFlagger/msio/timefrequencydata.h
+++ b/CEP/DP3/AOFlagger/include/AOFlagger/msio/timefrequencydata.h
@@ -314,7 +314,7 @@ class TimeFrequencyData
 					return _flagging[0];
 				else if(polarisation == YYPolarisation)
 					return _flagging[1];
-				else if(polarisation == StokesIPolarisation)
+				else if(polarisation == StokesIPolarisation || polarisation == StokesQPolarisation)
 					return GetSingleMask();
 				else if(polarisation == SinglePolarisation)
 					throw BadUsageException("Requesting single polarisation mask from auto dipole information, which polarisation to return?");
@@ -475,6 +475,9 @@ class TimeFrequencyData
 						data->SetGlobalMask(GetMask(polarisation));
 						break;
 					case StokesQPolarisation:
+						data= new TimeFrequencyData(StokesQPolarisation, GetStokesQFromDipole(0, 2), GetStokesQFromDipole(1, 3));
+						data->SetGlobalMask(GetMask(polarisation));
+						break;
 					case StokesUPolarisation:
 					case StokesVPolarisation:
 					case XYPolarisation:
diff --git a/CEP/DP3/AOFlagger/include/AOFlagger/strategy/actions/foreachpolarisationaction.h b/CEP/DP3/AOFlagger/include/AOFlagger/strategy/actions/foreachpolarisationaction.h
index ba2ce9c8050c1264e021031daa46b9a00f8e693a..83cba0f9e5bec835df99631dada624aff8d4aaeb 100644
--- a/CEP/DP3/AOFlagger/include/AOFlagger/strategy/actions/foreachpolarisationaction.h
+++ b/CEP/DP3/AOFlagger/include/AOFlagger/strategy/actions/foreachpolarisationaction.h
@@ -75,7 +75,7 @@ namespace rfiStrategy {
 					// There is only one polarisation in the contaminated data; just run all childs
 					ActionBlock::Perform(artifacts, progress);
 				}
-				else if(oldContaminatedData.Polarisation() == DipolePolarisation && isDecompositionSelected())
+				if(isDecompositionSelected())
 				{
 					performStokesIteration(artifacts, progress);
 				}