diff --git a/src/chess/board.rs b/src/chess/board.rs
index 8a4835b..282a7d2 100644
--- a/src/chess/board.rs
+++ b/src/chess/board.rs
@@ -340,6 +340,7 @@ impl Board {
         false
     }
 
+    // TODO: fix this
     pub fn threatened_by(&self, square: Square) -> Vec<Square> {
         let mut changes;
         let to_move = self.whites_turn;
@@ -351,10 +352,21 @@ impl Board {
                 let mut multiplier = 1;
 
                 loop {
-                    multiplier += 1;
                     if square.x() as i8 + change.ref_x() * multiplier < 0 || square.x() as i8 + change.ref_x() * multiplier > 7 ||
                         square.y() as i8 + change.ref_y() * multiplier < 0 || square.y() as i8 + change.ref_y() * multiplier > 7 ||
-                        self.used(Square::new((square.x() as i8 + change.ref_x() * multiplier) as u8, (square.y() as i8 + change.ref_y() * multiplier) as u8)) {
+                        {
+                            multiplier >= 2 &&
+                            !self.used(Square::new((square.x() as i8 + change.ref_x() * multiplier) as u8, (square.y() as i8 + change.ref_y() * multiplier) as u8))
+                        }
+                    {
+
+                        trace!(
+                            "{:?}:{:?}x{:?} => {:?}",
+                            {square.x() as i8 + change.ref_x() * multiplier},
+                            {square.y() as i8 + change.ref_y() * multiplier},
+                            multiplier,
+                            variant.as_piece_variant()
+                        );
                         break;
                     }
 
@@ -370,6 +382,7 @@ impl Board {
                     if !variant.iterable() {
                         break;
                     }
+                    multiplier += 1;
                 }
             }
         }