diff --git a/Makefile.ac b/Makefile.ac
index d32a65b2e7..cf751dfee3 100644
--- a/Makefile.ac
+++ b/Makefile.ac
@@ -50,7 +50,7 @@ help:
 	@echo "'paparazzi-make AIRCRAFT=<ac_name> [sim|ap.<action>|fbw.<action>|clean_ac]' where <action> is 'compile' or 'upload'"
 
 init:
-	@[ -d $(PAPARAZZI_HOME) ] || (echo "Copying config example in your $(PAPARAZZI_HOME) directory"; mkdir -p $(PAPARAZZI_HOME); cp -a conf $(PAPARAZZI_HOME); cp -a data $(PAPARAZZI_HOME); mkdir -p var/maps; mv $(PAPARAZZI_HOME)/data/maps/trtqtttqtsrrt*.jpg $(PAPARAZZI_HOME)/var/maps)
+	@[ -d $(PAPARAZZI_HOME) ] || (echo "Copying config example in your $(PAPARAZZI_HOME) directory"; mkdir -p $(PAPARAZZI_HOME); cp -a conf $(PAPARAZZI_HOME); cp -a data $(PAPARAZZI_HOME); mkdir -p $(PAPARAZZI_HOME)/var/maps; mv $(PAPARAZZI_HOME)/data/maps/trtqtttqtsrrt*.jpg $(PAPARAZZI_HOME)/var/maps)
 
 demo: ac1 ac2 ac3
 	PAPARAZZI_HOME=$(PAPARAZZI_HOME) PAPARAZZI_SRC=$(PAPARAZZI_SRC) $(SUPERVISION)
diff --git a/conf/flight_plans/versatile.xml b/conf/flight_plans/versatile.xml
index 7bf12a34ff..73ac7e6454 100644
--- a/conf/flight_plans/versatile.xml
+++ b/conf/flight_plans/versatile.xml
@@ -33,24 +33,26 @@
     </block>
 
     <block name="descent 0" strip_button="Descent">
-      <circle radius="50+(estimator_z-ground_alt)/2" wp="1" throttle="0.0" pitch="-0.3" vmode="throttle" until="ground_altitude+50 > estimator_z"/>
+      <circle radius="50+(estimator_z-ground_alt)/2" wp="1" throttle="0.0" pitch="-0.3" vmode="throttle" until="ground_alt+50 > estimator_z"/>
       <deroute block="circle 1"/>
     </block>
 
     <block name="route12">
       <go approaching_time="0" from="1" hmode="route" wp="2"/>
-      <deroute block="stack 2"/>
-    </block>
-
-    <block name="route21">
-      <go approaching_time="0" from="2" hmode="route" wp="1"/>
-      <deroute block="stack 1"/>
     </block>
 
     <block name="stack 2">
       <circle radius="75" wp="2"/>
     </block>
 
+    <block name="route21">
+      <go approaching_time="0" from="2" hmode="route" wp="1"/>
+    </block>
+
+    <block name="stack 1">
+      <circle radius="75" wp="1"/>
+    </block>
+
     <block name="survey">
       <survey_rectangle grid="150" wp1="S1" wp2="S2"/>
     </block>