diff --git a/src/java/cyanogenmod/app/Profile.java b/src/java/cyanogenmod/app/Profile.java
index ae8c9a2..495ec41 100755
--- a/src/java/cyanogenmod/app/Profile.java
+++ b/src/java/cyanogenmod/app/Profile.java
@@ -592,7 +592,7 @@ public final class Profile implements Parcelable, Comparable {
             dest.writeInt(0);
         }
         dest.writeInt(mScreenLockMode);
-        dest.writeMap(mTriggers);
+        dest.writeTypedArray(mTriggers.values().toArray(new ProfileTrigger[0]), flags);
         dest.writeInt(mExpandedDesktopMode);
         dest.writeInt(mDozeMode);
 
@@ -662,7 +662,9 @@ public final class Profile implements Parcelable, Comparable {
                 mBrightness = BrightnessSettings.CREATOR.createFromParcel(in);
             }
             mScreenLockMode = in.readInt();
-            in.readMap(mTriggers, null);
+            for (ProfileTrigger trigger : in.createTypedArray(ProfileTrigger.CREATOR)) {
+                mTriggers.put(trigger.mId, trigger);
+            }
             mExpandedDesktopMode = in.readInt();
             mDozeMode = in.readInt();
         }