diff --git a/Eigen/src/Core/DiagonalMatrix.h b/Eigen/src/Core/DiagonalMatrix.h
index af16cf563..7b105b299 100644
--- a/Eigen/src/Core/DiagonalMatrix.h
+++ b/Eigen/src/Core/DiagonalMatrix.h
@@ -46,6 +46,7 @@ class DiagonalBase : public EigenBase<Derived>
     };
 
     typedef Matrix<Scalar, RowsAtCompileTime, ColsAtCompileTime, 0, MaxRowsAtCompileTime, MaxColsAtCompileTime> DenseMatrixType;
+    typedef DiagonalMatrix<Scalar,DiagonalVectorType::SizeAtCompileTime,DiagonalVectorType::MaxSizeAtCompileTime> PlainObject;
 
     inline const Derived& derived() const { return *static_cast<const Derived*>(this); }
     inline Derived& derived() { return *static_cast<Derived*>(this); }
diff --git a/Eigen/src/Geometry/Transform.h b/Eigen/src/Geometry/Transform.h
index dfcb4a3f7..8bc2f41bd 100644
--- a/Eigen/src/Geometry/Transform.h
+++ b/Eigen/src/Geometry/Transform.h
@@ -380,10 +380,11 @@ public:
     * product results in a Transform of the same type (mode) as the lhs only if the lhs 
     * mode is no isometry. In that case, the returned transform is an affinity.
     */
-  friend inline const Transform<Scalar,Dim,((Mode==(int)Isometry)?Affine:(int)Mode)>
-    operator * (const Transform &a, const DiagonalMatrix<Scalar,Dim> &b)
+  template<typename DiagonalDerived>
+  inline const Transform<Scalar,Dim,((Mode==(int)Isometry)?Affine:(int)Mode)>
+    operator * (const DiagonalBase<DiagonalDerived> &b) const
   {
-    Transform<Scalar,Dim,((Mode==(int)Isometry)?Affine:(int)Mode)> res(a);
+    Transform<Scalar,Dim,((Mode==(int)Isometry)?Affine:(int)Mode)> res(*this);
     res.linear() *= b;
     return res;
   }
@@ -394,8 +395,9 @@ public:
     * product results in a Transform of the same type (mode) as the lhs only if the lhs 
     * mode is no isometry. In that case, the returned transform is an affinity.
     */
+  template<typename DiagonalDerived>
   friend inline const Transform<Scalar,Dim,((Mode==(int)Isometry)?Affine:(int)Mode)>
-    operator * (const DiagonalMatrix<Scalar,Dim> &a, const Transform &b)
+    operator * (const DiagonalBase<DiagonalDerived> &a, const Transform &b)
   {
     Transform<Scalar,Dim,((Mode==(int)Isometry)?Affine:(int)Mode)> res;
     res.linear().noalias() = a*b.linear();