diff --git a/src/zaxage_demo_01.prog.abap b/src/zaxage_demo_01.prog.abap
index 67a3752..8d33b2e 100644
--- a/src/zaxage_demo_01.prog.abap
+++ b/src/zaxage_demo_01.prog.abap
@@ -153,7 +153,8 @@ CLASS main IMPLEMENTATION.
     result->add( |You are in the { engine->player->location->name }.| ). " { player->location->description }|.
     text->set_textstream( result->get( ) ).
 
-    IF engine->player->location->things->exists( 'RFC' ).
+    IF engine->player->location = bill_developer->location AND
+       engine->player->location->things->exists( 'RFC' ).
       engine->mission_completed = abap_true.
     ENDIF.
 
diff --git a/src/zcl_axage_demo1.clas.abap b/src/zcl_axage_demo1.clas.abap
index b1dca40..22f1291 100644
--- a/src/zcl_axage_demo1.clas.abap
+++ b/src/zcl_axage_demo1.clas.abap
@@ -97,7 +97,8 @@ CLASS zcl_axage_demo1 IMPLEMENTATION.
     out->write( interprete( 'EAST'  )->get(  ) ).
     out->write( interprete( 'TAKE KNIFE' )->get(  ) ).
 
-    IF engine->player->location->things->exists( 'RFC' ).
+    IF engine->player->location = bill_developer->location AND
+       engine->player->location->things->exists( 'RFC' ).
       engine->mission_completed = abap_true.
       out->write( 'Congratulations! You delivered the RFC to the developers!' ).
     ENDIF.