diff --git a/src/overpass_api/statements/area_query.cc b/src/overpass_api/statements/area_query.cc
index 9ace11336..cd8d248c6 100644
--- a/src/overpass_api/statements/area_query.cc
+++ b/src/overpass_api/statements/area_query.cc
@@ -286,26 +286,35 @@ void Area_Query_Statement::get_ranges
 
 bool Area_Constraint::delivers_data(Resource_Manager& rman)
 {
+  int counter = 0;
+
+  // Count the indicies of the input areas
   if (!area->areas_from_input())
-    return false;
+  {
+    Block_Backend< Uint31_Index, Area_Skeleton > area_locations_db
+        (rman.get_area_transaction()->data_index(area_settings().AREAS));
+    for (Block_Backend< Uint31_Index, Area_Skeleton >::Flat_Iterator
+        it(area_locations_db.flat_begin());
+        !(it == area_locations_db.flat_end()); ++it)
+    {
+      if (area->get_submitted_id() == it.handle().id().val())
+        counter += it.object().used_indices.size();
+    }
+  }
   else
   {
     std::map< std::string, Set >::const_iterator mit = rman.sets().find(area->get_input());
     if (mit == rman.sets().end())
       return true;
-
-    // Count the indicies of the input areas
-    int counter = 0;
-
     for (std::map< Uint31_Index, std::vector< Area_Skeleton > >::const_iterator it = mit->second.areas.begin();
          it != mit->second.areas.end(); ++it)
     {
       for (std::vector< Area_Skeleton >::const_iterator it2 = it->second.begin(); it2 != it->second.end(); ++it2)
         counter += it2->used_indices.size();
     }
-
-    return (counter <= 12);
   }
+  
+  return (counter <= 12);
 }
 
 
diff --git a/src/overpass_api/statements/area_query.h b/src/overpass_api/statements/area_query.h
index e34256402..e1a4b08f1 100644
--- a/src/overpass_api/statements/area_query.h
+++ b/src/overpass_api/statements/area_query.h
@@ -73,8 +73,9 @@ class Area_Query_Statement : public Output_Statement
        const Statement& query, Resource_Manager& rman);
 
     bool areas_from_input() const { return (submitted_id == 0); }
+    long long get_submitted_id() const { return submitted_id; }
     std::string get_input() const { return input; }
-
+    
     static bool is_used() { return is_used_; }
 
     virtual std::string dump_xml(const std::string& indent) const