diff --git a/scenarios/MovePlatformToLandmarkTest/configs/MovePlatformToLandmarkExampleGraph.xml b/scenarios/MovePlatformToLandmarkTest/configs/MovePlatformToLandmarkExampleGraph.xml
index 9abf93e7e4ac967f2c82d2a4842921f9f030ab40..dc898b10e933fa50bbe51df8ce0242e827c2e923 100644
--- a/scenarios/MovePlatformToLandmarkTest/configs/MovePlatformToLandmarkExampleGraph.xml
+++ b/scenarios/MovePlatformToLandmarkTest/configs/MovePlatformToLandmarkExampleGraph.xml
@@ -67,6 +67,12 @@
 			<z>0</z>
 			<frame>Cupboard7Door</frame>
 		</Item9>
+		<Item10>
+			<x>3200</x>
+			<y>9600</y>
+			<z>0</z>
+			<frame>SinkTable</frame>
+		</Item10>
     </landmarkNodes>
     <!-- each edge is defined as "<nodename>;<nodename>" (";" is a delimiter between names, 
          so it shouldn't appear in any node name), all edges are bidirectional between the provided nodes -->
@@ -82,9 +88,11 @@
 		<Item8>4;TableWithRolls</Item8>
 		<Item9>4;Sink</Item9>
 		<Item10>4;Cupboard7Door</Item10>
+		<Item11>TableWithRolls;SinkTable</Item11>
     </landmarkEdges>
     <positionalAccuracy>10</positionalAccuracy> <!--mm-->
     <orientationalAccuracy>0.1</orientationalAccuracy> <!--rad-->
     <timeoutMoveTo>30000</timeoutMoveTo>
+    <waitAfterLast>3000</waitAfterLast>
   </StateParameters>
 </MovePlatformToLandmarkStateChart>
diff --git a/scenarios/MovePlatformToLandmarkTest/startScenario.sh b/scenarios/MovePlatformToLandmarkTest/startScenario.sh
index a5d62311e83556d5b7d65c99b1eb4ebb5c55ffca..bb413a3847d8af8a9208f915a6be0012eefeeb6a 100755
--- a/scenarios/MovePlatformToLandmarkTest/startScenario.sh
+++ b/scenarios/MovePlatformToLandmarkTest/startScenario.sh
@@ -16,7 +16,7 @@ export HUMANOIDROBOTAPI_BIN_PATH=$HUMANOIDROBOTAPI_PATH/build/bin
 export GLOBAL_CONFIG=./configs/Global.cfg
 
 # armarx components
-$SCRIPT_PATH/startApplication.sh $CORE_BIN_PATH/PlatformUnitObserverRun --Ice.Config=$GLOBAL_CONFIG,./configs/PlatformUnitObserver.cfg &
+$SCRIPT_PATH/startApplication.sh $HUMANOIDROBOTAPI_BIN_PATH/PlatformUnitObserverRun --Ice.Config=$GLOBAL_CONFIG,./configs/PlatformUnitObserver.cfg &
 $SCRIPT_PATH/startApplication.sh $CORE_BIN_PATH/SystemObserverRun --Ice.Config=$GLOBAL_CONFIG &
 $SCRIPT_PATH/startApplication.sh $CORE_BIN_PATH/RobotControlRun --Ice.Config=$GLOBAL_CONFIG &
 $SCRIPT_PATH/startApplication.sh $CORE_BIN_PATH/ConditionHandlerRun --Ice.Config=$GLOBAL_CONFIG &
diff --git a/source/RobotAPI/statecharts/MovePlatformToLandmark/MovePlatformToLandmark.cpp b/source/RobotAPI/statecharts/MovePlatformToLandmark/MovePlatformToLandmark.cpp
index b2cbb39913e1248e5ab7a353ef7e5a80725cb74c..7b6fcac5f5defb3c5ae51e9cb65bb9c4a2d87a3b 100644
--- a/source/RobotAPI/statecharts/MovePlatformToLandmark/MovePlatformToLandmark.cpp
+++ b/source/RobotAPI/statecharts/MovePlatformToLandmark/MovePlatformToLandmark.cpp
@@ -63,6 +63,7 @@ namespace armarx
         addToInput("positionalAccuracy", VariantType::Float, true);
         addToInput("orientationalAccuracy", VariantType::Float, true);
         addToInput("timeoutMoveTo", VariantType::Int, false);
+        addToInput("waitAfterLast", VariantType::Int, false);
     }
 
     void StatechartMovePlatformToLandmark::defineSubstates()