diff --git a/pengine/test10/bug-lf-2435.dot b/pengine/test10/bug-lf-2435.dot
index 2313c38360..2d0b65dc12 100644
--- a/pengine/test10/bug-lf-2435.dot
+++ b/pengine/test10/bug-lf-2435.dot
@@ -1,24 +1,25 @@
 digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "dummy2_start_0 c21.chepkov.lan" [ style=bold color="green" fontcolor="black" ]
 "dummy2_stop_0 c20.chepkov.lan" -> "all_stopped" [ style = bold]
 "dummy2_stop_0 c20.chepkov.lan" -> "dummy2_start_0 c21.chepkov.lan" [ style = bold]
 "dummy2_stop_0 c20.chepkov.lan" [ style=bold color="green" fontcolor="black" ]
 "dummy3_stop_0 c21.chepkov.lan" -> "all_stopped" [ style = bold]
+"dummy3_stop_0 c21.chepkov.lan" -> "dummy2_start_0 c21.chepkov.lan" [ style = bold]
 "dummy3_stop_0 c21.chepkov.lan" [ style=bold color="green" fontcolor="black" ]
 "dummy4_monitor_0 c19.chepkov.lan" -> "probe_complete c19.chepkov.lan" [ style = bold]
 "dummy4_monitor_0 c19.chepkov.lan" [ style=bold color="green" fontcolor="black" ]
 "dummy4_monitor_0 c20.chepkov.lan" -> "probe_complete c20.chepkov.lan" [ style = bold]
 "dummy4_monitor_0 c20.chepkov.lan" [ style=bold color="green" fontcolor="black" ]
 "dummy4_monitor_0 c21.chepkov.lan" -> "probe_complete c21.chepkov.lan" [ style = bold]
 "dummy4_monitor_0 c21.chepkov.lan" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c19.chepkov.lan" -> "probe_complete" [ style = bold]
 "probe_complete c19.chepkov.lan" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c20.chepkov.lan" -> "probe_complete" [ style = bold]
 "probe_complete c20.chepkov.lan" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c21.chepkov.lan" -> "probe_complete" [ style = bold]
 "probe_complete c21.chepkov.lan" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" -> "dummy2_stop_0 c20.chepkov.lan" [ style = bold]
 "probe_complete" -> "dummy3_stop_0 c21.chepkov.lan" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/test10/bug-lf-2435.exp b/pengine/test10/bug-lf-2435.exp
index deba2ec400..19cfecb6de 100644
--- a/pengine/test10/bug-lf-2435.exp
+++ b/pengine/test10/bug-lf-2435.exp
@@ -1,138 +1,141 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="1"  transition_id="0">
   <synapse id="0">
     <action_set>
       <rsc_op id="12" operation="start" operation_key="dummy2_start_0" on_node="c21.chepkov.lan" on_node_uuid="c21.chepkov.lan">
         <primitive id="dummy2" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_timeout="120000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="11" operation="stop" operation_key="dummy2_stop_0" on_node="c20.chepkov.lan" on_node_uuid="c20.chepkov.lan"/>
       </trigger>
+      <trigger>
+        <rsc_op id="13" operation="stop" operation_key="dummy3_stop_0" on_node="c21.chepkov.lan" on_node_uuid="c21.chepkov.lan"/>
+      </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <rsc_op id="11" operation="stop" operation_key="dummy2_stop_0" on_node="c20.chepkov.lan" on_node_uuid="c20.chepkov.lan">
         <primitive id="dummy2" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_timeout="120000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
       <rsc_op id="8" operation="monitor" operation_key="dummy4_monitor_0" on_node="c21.chepkov.lan" on_node_uuid="c21.chepkov.lan">
         <primitive id="dummy4" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="120000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="3">
     <action_set>
       <rsc_op id="6" operation="monitor" operation_key="dummy4_monitor_0" on_node="c20.chepkov.lan" on_node_uuid="c20.chepkov.lan">
         <primitive id="dummy4" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="120000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="4">
     <action_set>
       <rsc_op id="4" operation="monitor" operation_key="dummy4_monitor_0" on_node="c19.chepkov.lan" on_node_uuid="c19.chepkov.lan">
         <primitive id="dummy4" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="120000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="5">
     <action_set>
       <rsc_op id="13" operation="stop" operation_key="dummy3_stop_0" on_node="c21.chepkov.lan" on_node_uuid="c21.chepkov.lan">
         <primitive id="dummy3" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_timeout="120000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6" priority="1000000">
     <action_set>
       <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="c21.chepkov.lan" on_node_uuid="c21.chepkov.lan">
         <attributes CRM_meta_op_no_wait="true" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="8" operation="monitor" operation_key="dummy4_monitor_0" on_node="c21.chepkov.lan" on_node_uuid="c21.chepkov.lan"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7" priority="1000000">
     <action_set>
       <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="c20.chepkov.lan" on_node_uuid="c20.chepkov.lan">
         <attributes CRM_meta_op_no_wait="true" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="6" operation="monitor" operation_key="dummy4_monitor_0" on_node="c20.chepkov.lan" on_node_uuid="c20.chepkov.lan"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8" priority="1000000">
     <action_set>
       <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="c19.chepkov.lan" on_node_uuid="c19.chepkov.lan">
         <attributes CRM_meta_op_no_wait="true" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="4" operation="monitor" operation_key="dummy4_monitor_0" on_node="c19.chepkov.lan" on_node_uuid="c19.chepkov.lan"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
       <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="c19.chepkov.lan" on_node_uuid="c19.chepkov.lan"/>
       </trigger>
       <trigger>
         <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="c20.chepkov.lan" on_node_uuid="c20.chepkov.lan"/>
       </trigger>
       <trigger>
         <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="c21.chepkov.lan" on_node_uuid="c21.chepkov.lan"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
       <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="11" operation="stop" operation_key="dummy2_stop_0" on_node="c20.chepkov.lan" on_node_uuid="c20.chepkov.lan"/>
       </trigger>
       <trigger>
         <rsc_op id="13" operation="stop" operation_key="dummy3_stop_0" on_node="c21.chepkov.lan" on_node_uuid="c21.chepkov.lan"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/pengine/test10/simple6.dot b/pengine/test10/simple6.dot
index ac3c4951e6..3fac6087ab 100644
--- a/pengine/test10/simple6.dot
+++ b/pengine/test10/simple6.dot
@@ -1,13 +1,14 @@
  digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" -> "rsc1_stop_0 node1" [ style = bold]
 "probe_complete" -> "rsc2_start_0 node1" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_stop_0 node1" -> "all_stopped" [ style = bold]
+"rsc1_stop_0 node1" -> "rsc2_start_0 node1" [ style = bold]
 "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 }
diff --git a/pengine/test10/simple6.exp b/pengine/test10/simple6.exp
index 9b8890f3ba..b8cd6b42e6 100644
--- a/pengine/test10/simple6.exp
+++ b/pengine/test10/simple6.exp
@@ -1,74 +1,77 @@
  <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
    <synapse id="0" priority="2">
      <action_set>
        <rsc_op id="5" operation="start" operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc2" class="heartbeat" type="apache"/>
         <attributes CRM_meta_timeout="20000"  priority="2.0"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
+      <trigger>
+        <rsc_op id="6" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
+      </trigger>
      </inputs>
    </synapse>
   <synapse id="1" priority="2">
     <action_set>
       <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc2" class="heartbeat" type="apache"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  priority="2.0"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
    <synapse id="2" priority="1">
      <action_set>
        <rsc_op id="6" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
         <attributes CRM_meta_timeout="20000"  priority="1.0"/>
        </rsc_op>
      </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
    </synapse>
   <synapse id="3" priority="1000000">
      <action_set>
       <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
         <attributes CRM_meta_op_no_wait="true" />
       </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
         <attributes />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="5">
      <action_set>
       <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="6" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/pengine/test10/simple6.summary b/pengine/test10/simple6.summary
index 2c4079b3ac..42dde4ad2f 100644
--- a/pengine/test10/simple6.summary
+++ b/pengine/test10/simple6.summary
@@ -1,24 +1,24 @@
 
 Current cluster status:
 Online: [ node1 ]
 
  rsc2	(heartbeat:apache):	Stopped 
  rsc1	(heartbeat:apache):	Started node1
 
 Transition Summary:
  * Start   rsc2	(node1)
  * Stop    rsc1	(node1)
 
 Executing cluster transition:
  * Resource action: rsc2            monitor on node1
  * Pseudo action:   probe_complete
- * Resource action: rsc2            start on node1
  * Resource action: rsc1            stop on node1
  * Pseudo action:   all_stopped
+ * Resource action: rsc2            start on node1
 
 Revised cluster status:
 Online: [ node1 ]
 
  rsc2	(heartbeat:apache):	Started node1
  rsc1	(heartbeat:apache):	Stopped