diff --git a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/distributed/FieldBusManagerImpl.java b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/distributed/FieldBusManagerImpl.java
index ad7dee39..f9347619 100644
--- a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/distributed/FieldBusManagerImpl.java
+++ b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/distributed/FieldBusManagerImpl.java
@@ -1,4 +1,4 @@
-	package gov.pnnl.goss.gridappsd.distributed;
+		package gov.pnnl.goss.gridappsd.distributed;
 	
 	import java.io.Serializable;
 	import java.util.ArrayList;
@@ -133,6 +133,8 @@ public Serializable handleRequest(String request_queue, Serializable request) {
 				RequestFieldContext requestFieldContext = RequestFieldContext.parse(request.toString());
 				if (requestFieldContext.areaId == null)
 					return topology.root.feeders;
+				else if(requestFieldContext.areaId.equals(topology.root.feeders.message_bus_id))
+                                       return topology.root.feeders;
 				else {
 					for (SwitchArea switchArea : topology.root.feeders.switch_areas) {
 						if (requestFieldContext.areaId.equals(switchArea.message_bus_id))
@@ -383,4 +385,4 @@ public void getFieldMeasurementIds(String fieldModelMrid) {
 	
 		}
 	
-	}
\ No newline at end of file
+	}