diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
index d25b28d..8c79dcf 100644
--- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
+++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
@@ -342,6 +342,22 @@ class JackrabbitNodeState extends AbstractNodeState {
         properties.put(JCR_PRIMARYTYPE, PropertyStates.createProperty(
                 JCR_PRIMARYTYPE, primary, Type.NAME));
 
+        for (PropertyEntry property : bundle.getPropertyEntries()) {
+            String name = createName(property.getName());
+            try {
+                int type = property.getType();
+                if (property.isMultiValued()) {
+                    properties.put(name, createProperty(
+                            name, type, property.getValues()));
+                } else {
+                    properties.put(name, createProperty(
+                            name, type, property.getValues()[0]));
+                }
+            } catch (Exception e) {
+                warn("Skipping broken property entry " + name, e);
+            }
+        }
+
         Set<String> mixins = newLinkedHashSet();
         if (bundle.getMixinTypeNames() != null) {
             for (Name mixin : bundle.getMixinTypeNames()) {
@@ -359,22 +375,6 @@ class JackrabbitNodeState extends AbstractNodeState {
                     JCR_UUID, bundle.getId().toString()));
         }
 
-        for (PropertyEntry property : bundle.getPropertyEntries()) {
-            String name = createName(property.getName());
-            try {
-                int type = property.getType();
-                if (property.isMultiValued()) {
-                    properties.put(name, createProperty(
-                            name, type, property.getValues()));
-                } else {
-                    properties.put(name, createProperty(
-                            name, type, property.getValues()[0]));
-                }
-            } catch (Exception e) {
-                warn("Skipping broken property entry " + name, e);
-            }
-        }
-
         return properties;
     }