diff --git a/bacnet-stack/demo/handler/h_whohas.c b/bacnet-stack/demo/handler/h_whohas.c
index 8dbd4d31..28d7db3e 100644
--- a/bacnet-stack/demo/handler/h_whohas.c
+++ b/bacnet-stack/demo/handler/h_whohas.c
@@ -110,7 +110,10 @@ void handler_who_has(
 }
 
 
-#ifdef DEPRECATED       /* was for BAC_ROUTING - delete in 2/2012 if still unused */
+#ifdef BAC_ROUTING      /* was for BAC_ROUTING - delete in 2/2012 if still unused */
+						/* EKH: I restored this to BAC_ROUTING (from DEPRECATED) because I found that the server demo with the built-in 
+								virtual Router did not insert the SADRs of the virtual devices on the virtual network without it */
+
 /** Handler for Who-Has requests in the virtual routing setup,
  * with broadcast I-Have response.
  * Will respond if the device Object ID matches, and we have
diff --git a/bacnet-stack/demo/handler/h_whois.c b/bacnet-stack/demo/handler/h_whois.c
index 4d456afa..819da580 100644
--- a/bacnet-stack/demo/handler/h_whois.c
+++ b/bacnet-stack/demo/handler/h_whois.c
@@ -113,7 +113,11 @@ void handler_who_is_unicast(
 }
 
 
-#ifdef DEPRECATED       /* was for BAC_ROUTING - delete in 2/2012 if still unused */
+#ifdef BAC_ROUTING      /* was for BAC_ROUTING - delete in 2/2012 if still unused */
+						/* EKH: I restored this to BAC_ROUTING (from DEPRECATED) because I found that the server demo with the built-in 
+								virtual Router did not insert the SADRs of the virtual devices on the virtual network without it */
+								
+								
 /** Local function to check Who-Is requests against our Device IDs.
  * Will check the gateway (root Device) and all virtual routed
  * Devices against the range and respond for each that matches.