diff --git a/CHANGELOG b/CHANGELOG
index 403ffd3..22877e3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-* Avoid potential memory leaks in Firefox. (wpc, Tobie Langel) [#12 state:resolved]
+* Element#down on an input element should not raise error. (humeniuc, kangax)
 
 * More unit tests for Object.isHash. (Tobie Langel)
 
diff --git a/src/dom.js b/src/dom.js
index 45e8533..d5df211 100644
--- a/src/dom.js
+++ b/src/dom.js
@@ -233,7 +233,7 @@ Element.Methods = {
     element = $(element);
     if (arguments.length == 1) return element.firstDescendant();
     return Object.isNumber(expression) ? element.descendants()[expression] :
-      element.select(expression)[index || 0];
+      Element.select(element, expression)[index || 0];
   },
 
   previous: function(element, expression, index) {
diff --git a/test/unit/dom_test.js b/test/unit/dom_test.js
index 7726a44..1d51c36 100644
--- a/test/unit/dom_test.js
+++ b/test/unit/dom_test.js
@@ -561,6 +561,10 @@ new Test.Unit.Runner({
     var dummy = $(document.createElement('DIV'));
     dummy.innerHTML = '<div></div>'.times(3);
     this.assert(typeof dummy.down().setStyle == 'function');
+    
+    var input = $$('input')[0];
+    this.assertNothingRaised(function(){ input.down('span') });
+    this.assertUndefined(input.down('span'));
   },
   
   testElementPrevious: function() {