diff --git a/opm/simulators/flow/FIPContainer.cpp b/opm/simulators/flow/FIPContainer.cpp
index 3ae9b46d9..00557a1cd 100644
--- a/opm/simulators/flow/FIPContainer.cpp
+++ b/opm/simulators/flow/FIPContainer.cpp
@@ -27,7 +27,7 @@
 
 #include <opm/material/fluidsystems/BlackOilDefaultIndexTraits.hpp>
 #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
-#include <opm/material/fluidsystems/GenericOilGasFluidSystem.hpp>
+#include <opm/material/fluidsystems/GenericOilGasWaterFluidSystem.hpp>
 
 #include <opm/output/data/Solution.hpp>
 
@@ -438,16 +438,27 @@ INSTANTIATE_TYPE(double)
 INSTANTIATE_TYPE(float)
 #endif
 
-#define INSTANTIATE_COMP(NUM) \
-    template<class T> using FS##NUM = GenericOilGasFluidSystem<T, NUM>; \
+#define INSTANTIATE_COMP_THREEPHASE(NUM) \
+    template<class T> using FS##NUM = GenericOilGasWaterFluidSystem<T, NUM, true>; \
     template class FIPContainer<FS##NUM<double>>;
 
-INSTANTIATE_COMP(0)
-INSTANTIATE_COMP(2)
-INSTANTIATE_COMP(3)
-INSTANTIATE_COMP(4)
-INSTANTIATE_COMP(5)
-INSTANTIATE_COMP(6)
-INSTANTIATE_COMP(7)
+INSTANTIATE_COMP_THREEPHASE(0)
+INSTANTIATE_COMP_THREEPHASE(2)
+INSTANTIATE_COMP_THREEPHASE(3)
+INSTANTIATE_COMP_THREEPHASE(4)
+INSTANTIATE_COMP_THREEPHASE(5)
+INSTANTIATE_COMP_THREEPHASE(6)
+INSTANTIATE_COMP_THREEPHASE(7)
+
+#define INSTANTIATE_COMP_TWOPHASE(NUM) \
+    template<class T> using GFS##NUM = GenericOilGasWaterFluidSystem<T, NUM, false>; \
+    template class FIPContainer<GFS##NUM<double>>;
+
+INSTANTIATE_COMP_TWOPHASE(2)
+INSTANTIATE_COMP_TWOPHASE(3)
+INSTANTIATE_COMP_TWOPHASE(4)
+INSTANTIATE_COMP_TWOPHASE(5)
+INSTANTIATE_COMP_TWOPHASE(6)
+INSTANTIATE_COMP_TWOPHASE(7)
 
 } // namespace Opm