diff --git a/ChangeLog b/ChangeLog
index eae7d53930..5c81479e40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 16 15:00:21 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb (Scalar#/): fix bug whereby (any numeric)/(any
+	  Matrix) would raise an error
+
 Wed Sep 16 13:30:20 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
 	* lib/matrix.rb:  trivial optimizations
diff --git a/lib/matrix.rb b/lib/matrix.rb
index 632b5fe266..17a0b50718 100644
--- a/lib/matrix.rb
+++ b/lib/matrix.rb
@@ -894,7 +894,7 @@ class Matrix
       when Vector
         Scalar.Raise WrongArgType, other.class, "Numeric or Scalar or Matrix"
       when Matrix
-        self * _M.inverse
+        self * other.inverse
       else
         x, y = other.coerce(self)
         x / y