diff --git a/VERSION b/VERSION
index 75c304c4..6b8153e7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.2.1 (2012-12-03 17:38:35) stable
+Version 2.2.1 (2012-12-03 18:01:57) stable
diff --git a/gluon/dal.py b/gluon/dal.py
index 88e5bd88..d9a1b73d 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -8558,8 +8558,8 @@ class Field(Expression):
         if self.custom_store:
             return self.custom_store(file,filename,path)
         if isinstance(file, cgi.FieldStorage):
-            file = file.file
             filename = filename or file.filename
+            file = file.file
         elif not filename:
             filename = file.name
         filename = os.path.basename(filename.replace('/', os.sep)\