diff --git a/ai.asm b/ai.asm
index e88a2b0..5a22671 100644
--- a/ai.asm
+++ b/ai.asm
@@ -359,13 +359,8 @@ NotNegativeEnergy
     adw Force #100 RandBoundaryHigh
     jsr RandomizeForce
     ; if target distance lower than 24 - set weapon to Baby Missile (for security :)
-    jsr GetDistance
-    cmp #6 ; 24/4
-    bcs HighForce
-    lda #ind_Baby_Missile
-    sta ActiveWeapon,x
-HighForce
-    rts
+    jmp GetDistance
+    ;rts
 .endp
 ;----------------------------------------------
 .proc Spoiler
@@ -391,13 +386,8 @@ NotNegativeEnergy
     adw Force #50 RandBoundaryHigh
     jsr RandomizeForce
     ; if target distance lower than 24 - set weapon to Baby Missile (for security :)
-    jsr GetDistance
-    cmp #6    ; 24/4
-    bcs HighForce
-    lda #ind_Baby_Missile
-    sta ActiveWeapon,x
-HighForce
-    rts
+    jmp GetDistance
+    ;rts
 .endp
 ;----------------------------------------------
 .proc Cyborg
@@ -419,14 +409,9 @@ HighForce
     sta ForceTableL,x
     lda Force+1
     sta ForceTableH,x
-    ; if target distance lower than 32 - set weapon to Baby Missile (for security :)
-    jsr GetDistance
-    cmp #8    ;32/4
-    bcs HighForce
-    lda #ind_Baby_Missile
-    sta ActiveWeapon,x
-HighForce
-    rts
+    ; if target distance lower than 24 - set weapon to Baby Missile (for security :)
+    jmp GetDistance
+    ;rts
 .endp
 
 ;----------------------------------------------
@@ -1079,7 +1064,7 @@ loop
 ; This procedure must be called immediately after targeting.
 ; xdraw value should remain unchanged from the end of the Flight procedure.
 ;
-; result in A
+; if target distance lower than 24 - set weapon to Baby Missile
 ;----------------------------------------------
     ;xdraw/4
     lda xdraw+1
@@ -1095,6 +1080,16 @@ YisLower
     eor #$ff
     adc #1
 XisLower
+    ;rts
+    cpx TargetTankNr    ; If tank is aiming at itself don't change weapon,
+    beq NoChangeToBM    ; he is the only one without a Long Shlong :)
+    ; if target distance lower than 24 - set weapon to Baby Missile (for security :)
+    cmp #6    ; 24/4
+    bcs HighDistance
+    lda #ind_Baby_Missile
+    sta ActiveWeapon,x
+HighDistance
+NoChangeToBM
     rts
 .endp
 
diff --git a/scorch.asm b/scorch.asm
index 3c431e2..eb9f0b6 100644
--- a/scorch.asm
+++ b/scorch.asm
@@ -26,7 +26,7 @@
 
 ;---------------------------------------------------
 .macro build
-    dta d"1.36" ; number of this build (4 bytes)
+    dta d"1.37" ; number of this build (4 bytes)
 .endm
 
 .macro RMTSong
diff --git a/scorch.bin b/scorch.bin
index 7f891c1..12b187f 100644
Binary files a/scorch.bin and b/scorch.bin differ
diff --git a/scorch.xex b/scorch.xex
index 2036e25..d8b5189 100644
Binary files a/scorch.xex and b/scorch.xex differ