Thank you for the great feedback!
I'm working on solving that bug right now. I know what the problem is, but the fix will take a bit of time. For now I turned off saving while in the battle map in the game. Progression is still saved in the system map though.