diff --git a/ChangeLog b/ChangeLog
index e9b1744599..fc9bfb7bb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Dec  9 23:00:54 2001  Keiju Ishitsuka <keiju@ishitsuka.com>
+	* matrix.rb: Vector#* bug. reported from Massimiliano Mirra
+	<info@chromatic-harp.com>. 
+
 Sun Dec  9 18:06:05 2001  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/net/protocol.rb: calls on_connect before conn_command
diff --git a/lib/matrix.rb b/lib/matrix.rb
index fa454e338e..8e092b0d0b 100644
--- a/lib/matrix.rb
+++ b/lib/matrix.rb
@@ -902,9 +902,9 @@ class Vector
       els = @elements.collect{|e| e * x}
       Vector.elements(els, false)
     when Matrix
-      self.covector * x
+      Matrix.column_vector(self) * x
     else
-      s, x = X.coerce(self)
+      s, x = x.coerce(self)
       s * x
     end
   end