diff --git a/dune/gfe/rigidbodymotion.hh b/dune/gfe/rigidbodymotion.hh
index 9a5820f800d31b87326ed510bea8ca502b5e0133..5978e4ce57b7bbe879a013db10886b4b96319f8c 100644
--- a/dune/gfe/rigidbodymotion.hh
+++ b/dune/gfe/rigidbodymotion.hh
@@ -88,9 +88,9 @@ public:
             result.r[i] = p.r[i] + v[i];
 
         // Add rotational correction
-        typedef typename Dune::SelectType<Dune::is_same<TVector,TangentVector>::value,
+        typedef typename std::conditional<Dune::is_same<TVector,TangentVector>::value,
                                           typename Rotation<ctype,N>::TangentVector,
-                                          typename Rotation<ctype,N>::EmbeddedTangentVector>::Type RotationTangentVector;
+                                          typename Rotation<ctype,N>::EmbeddedTangentVector>::type RotationTangentVector;
         RotationTangentVector qCorr;
         for (int i=0; i<RotationTangentVector::dimension; i++)
             qCorr[i] = v[N+i];