From b25af0f05f73da6b17bb1d52e95247e468b19277 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Thu, 9 May 2019 17:45:48 -0700
Subject: [PATCH] Fix property state merging bug

---
 cli/src/properties.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cli/src/properties.rs b/cli/src/properties.rs
index 44a444ab..33489f4d 100644
--- a/cli/src/properties.rs
+++ b/cli/src/properties.rs
@@ -315,6 +315,9 @@ impl Builder {
                         transition.state_id = *replacement;
                     }
                 }
+                if let Some(replacement) = state_replacements.get(&state.default_next_state_id) {
+                    state.default_next_state_id = *replacement;
+                }
                 state.transitions.dedup();
             }
         }
@@ -338,6 +341,7 @@ impl Builder {
             for transition in state.transitions.iter_mut() {
                 transition.state_id = final_state_replacements[transition.state_id];
             }
+            state.default_next_state_id = final_state_replacements[state.default_next_state_id]
         }
 
         let mut i = 0;