diff --git a/Form.php b/Form.php
index 08d2295c..13ecf68f 100644
--- a/Form.php
+++ b/Form.php
@@ -89,10 +89,6 @@ public function getValues()
     {
         $values = array();
         foreach ($this->fields->all() as $name => $field) {
-            if ($field->isDisabled()) {
-                continue;
-            }
-
             if (!$field instanceof Field\FileFormField && $field->hasValue()) {
                 $values[$name] = $field->getValue();
             }
@@ -115,10 +111,6 @@ public function getFiles()
         $files = array();
 
         foreach ($this->fields->all() as $name => $field) {
-            if ($field->isDisabled()) {
-                continue;
-            }
-
             if ($field instanceof Field\FileFormField) {
                 $files[$name] = $field->getValue();
             }
@@ -463,7 +455,7 @@ private function initialize()
 
     private function addField(\DOMElement $node)
     {
-        if (!$node->hasAttribute('name') || !$node->getAttribute('name')) {
+        if (!$node->hasAttribute('name') || !$node->getAttribute('name') || $node->hasAttribute('disabled')) {
             return;
         }