diff --git a/src/dma/mod.rs b/src/dma/mod.rs
index 7f7d063..8ccf747 100755
--- a/src/dma/mod.rs
+++ b/src/dma/mod.rs
@@ -83,8 +83,9 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
 
         let bomb_defuse_end: f32 = {
             if bomb_can_defuse {
-                if let Some(defuse_stamp) = data.bomb_defuse_stamp {
-                    data.bomb_plant_timer - (data.bomb_defuse_length - defuse_stamp.elapsed().as_secs_f32())
+                if let (Some(bomb_stamp), Some(defuse_stamp)) = (data.bomb_planted_stamp, data.bomb_defuse_stamp) {
+                    let defuse_left = data.bomb_defuse_length - defuse_stamp.elapsed().as_secs_f32();
+                    (data.bomb_plant_timer - bomb_stamp.elapsed().as_secs_f32()) - defuse_left
                 } else {
                     0.0
                 }
diff --git a/webradar/script.js b/webradar/script.js
index 5ae2fcf..0e4b30c 100755
--- a/webradar/script.js
+++ b/webradar/script.js
@@ -227,7 +227,7 @@ function render() {
 
                     // Defuse stamp line
                     if (radarData.bombCanDefuse) {
-                        console.log("radarData.bombDefuseEnd")
+                        console.log(radarData.bombDefuseEnd)
                         ctx.strokeStyle = "green"
                         ctx.beginPath()
                         ctx.moveTo(130 + (maxWidth-2) * (radarData.bombDefuseEnd / 40), 16)