diff --git a/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java b/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java
index 894c8a5..3f11e4d 100644
--- a/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java
+++ b/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java
@@ -317,7 +317,8 @@ public class DepotMarshaller<T>
             columns.add(rs.getString("COLUMN_NAME"));
         }
 
-        for (FieldMarshaller fmarsh : _fields.values()) {
+        for (String fname : _allFields) {
+            FieldMarshaller fmarsh = _fields.get(fname);
             if (columns.contains(fmarsh.getColumnName())) {
                 continue;
             }