diff --git a/pass-1/hide-eid.c b/pass-1/hide-eid.c
index 77574a6..6068ac6 100644
--- a/pass-1/hide-eid.c
+++ b/pass-1/hide-eid.c
@@ -26,13 +26,21 @@ int main(int argc, char** argv)
         warn( "Usage: %s <rloc database> <listen_ifname> <output_ifname> [ <rloc> <keyfile> ]n", argv[0] );
         return 1;
     }
-
+    
     rlocs_init();
     if ( !session_setup( &session, argv[1], argv[2], argv[3] ) ) {
         warn( "Failed to set up session, exiting" );
         return 1;
     }
 
+    if  (argc > 4 ) {
+        if ( !session_upgrade_rlocs( &session, argc - 4, argv + 4 ) ) {
+            warn( "Failed to upgrade rlocs for session, exiting" );
+            session_teardown( &session );
+            return 1;
+        }    
+    }    
+    
     memset( &recv_pkt, 0, sizeof( struct recv_pkt ) );
     memset( &to_send, 0, sizeof( struct rsp_data ) );