diff --git a/src/adv/AdvBattle.lua b/src/adv/AdvBattle.lua
index 19c933f..1c4e497 100644
--- a/src/adv/AdvBattle.lua
+++ b/src/adv/AdvBattle.lua
@@ -63,6 +63,7 @@ function Battle:initPlayer()
 				player[attr] = baseAttr[attr] + baseAttr[attr] * player.growth * player.level
 			end
 		end
+		player.hpMax = player.hp or 0
 		self.adv.advTeam.player = player
 		self.isNewPlayer = true
 	end
diff --git a/src/adv/AdvPlayer.lua b/src/adv/AdvPlayer.lua
index da1e575..ff2a633 100644
--- a/src/adv/AdvPlayer.lua
+++ b/src/adv/AdvPlayer.lua
@@ -460,7 +460,7 @@ end
 
 function Player:getDB()
 	local db = Player.super.getDB(self)
-	for _ , field in pairs({level, exp, growth}) do
+	for _ , field in pairs({"level", "exp", "growth"}) do
 		db[field] = self[field]
 	end
 	return db
--
libgit2 0.21.2