diff --git a/src/visibility.rs b/src/visibility.rs
index be38898..8027078 100644
--- a/src/visibility.rs
+++ b/src/visibility.rs
@@ -152,7 +152,7 @@ fn update_viewshed(
 }
 
 fn update_viewshed_for_coordinates(
-    visible: Query<(&Coordinates, &BlocksVisibility), Changed<Coordinates>>,
+    visible: Query<&Coordinates, (Changed<Coordinates>, With<BlocksVisibility>)>,
     mut viewers: Query<(Entity, &mut Viewshed, &Coordinates)>,
     map: Query<&Map>,
     query_pipeline: Res<QueryPipeline>,
@@ -160,7 +160,7 @@ fn update_viewshed_for_coordinates(
     blocks_visibility: Query<&BlocksVisibility>,
     coordinates_query: Query<&Coordinates>,
 ) {
-    for (coordinates, _) in visible.iter() {
+    for coordinates in visible.iter() {
         for (viewer_entity, mut viewshed, start) in viewers.iter_mut() {
             if coordinates.distance(start) > viewshed.range as f32 {
                 continue;