diff --git a/ai.asm b/ai.asm
index 0dcc1ce..a6084f0 100644
--- a/ai.asm
+++ b/ai.asm
@@ -577,6 +577,8 @@ skipThisPlayer
 ; returns angle and power of shoot tank X (TankNr)
 ; in the appropriate variables (Angle and Force)
 ;----------------------------------------------
+	lda ActiveWeapon,x
+	pha					; store active weapon
 	mva #$ff SecondTryFlag
 	; set initial Angle and Force values
 	lda OptionsTable+2	; selected gravity
@@ -696,6 +698,8 @@ NoHitInSecondLoopR
 	inc NewAngle
 EndOfSecondLoopR
 EndOfAim
+	pla					; and restore active weapon
+	sta ActiveWeapon,x
 	rts
 
 AimSecondTry
@@ -787,8 +791,7 @@ NoHitInSecondLoopL
 	; Angle 1 deg to left and end loop 
 	dec NewAngle
 EndOfSecondLoopL
-
-	rts
+	jmp EndOfAim
 	
 SetStartAndFlight	; set start point (virtual barrel end :) ) and make test flight
 	; xtraj+1 and ytraj+1 set
diff --git a/scorch.bin b/scorch.bin
index 0ed068d..b887298 100644
Binary files a/scorch.bin and b/scorch.bin differ
diff --git a/scorch.xex b/scorch.xex
index c99f54e..27e81a9 100644
Binary files a/scorch.xex and b/scorch.xex differ