diff --git a/player.go b/player.go
index 1baf8fa..a14d411 100644
--- a/player.go
+++ b/player.go
@@ -50,6 +50,7 @@ func (p *player) recv() {
 			// log.Printf("%v", msg.FireAt)
 
 			if msg.Repair != nil && *msg.Repair == true {
+				r.ActiveScan = false
 				r.TargetSpeed = 0
 				r.FireAt = nil
 				r.MoveTo = nil
@@ -57,6 +58,7 @@ func (p *player) recv() {
 					r.RepairCounter = 3.0
 				}
 			} else if msg.Scan != nil && *msg.Scan == true {
+				r.RepairCounter = 0
 				r.TargetSpeed = 0
 				r.FireAt = nil
 				r.MoveTo = nil