diff --git a/modules/core/graph.js b/modules/core/graph.js
index 27b575164..7d168b35c 100644
--- a/modules/core/graph.js
+++ b/modules/core/graph.js
@@ -34,6 +34,12 @@ coreGraph.prototype = {
 
     entity: function(id) {
         var entity = this.entities[id];
+
+        //https://github.com/openstreetmap/iD/issues/3973#issuecomment-307052376
+        if (!entity) {
+            entity = this.entities.__proto__[id];
+        }
+
         if (!entity) {
             throw new Error('entity ' + id + ' not found');
         }