diff --git a/questtypes/bossfight/html/submission.tpl b/questtypes/bossfight/html/submission.tpl
index 6861e0ea..260d28b0 100644
--- a/questtypes/bossfight/html/submission.tpl
+++ b/questtypes/bossfight/html/submission.tpl
@@ -10,29 +10,29 @@
 <?php foreach($stages as &$stage) : ?>
 <p><?=$stage['question']?></p>
 <div class="cf">
-<section class="opponent">
-	<p class="fwb"><?=$character['name']?></p>
-	<p>
-		<?php if($lives['character'] > 0) : ?>
-		<?php foreach(range(1,$lives['character']) as $i) : ?>
-		<i class="fa fa-heart fa-fw"></i>
-		<?php endforeach ?>
-		<?php else : ?>
-		<?=_('lost')?>
-		<?php endif ?>
-	</p>
-</section>
-<section class="opponent">
-	<p class="fwb"><?=$fight['bossname']?></p>
-	<p>
-		<?php if($lives['boss'] > 0) : ?>
-		<?php foreach(range(1,$lives['boss']) as $i) : ?>
-		<i class="fa fa-heart fa-fw"></i>
-		<?php endforeach ?>
-		<?php else : ?>
-		<?=_('lost')?>
-		<?php endif ?>
-	</p>
-</section>
+	<section class="opponent">
+		<p class="fwb"><?=$character['name']?></p>
+		<p>
+			<?php if($stage['lives']['character'] > 0) : ?>
+			<?php foreach(range(1,$stage['lives']['character']) as $i) : ?>
+			<i class="fa fa-heart fa-fw"></i>
+			<?php endforeach ?>
+			<?php else : ?>
+			<?=_('lost')?>
+			<?php endif ?>
+		</p>
+	</section>
+	<section class="opponent">
+		<p class="fwb"><?=$fight['bossname']?></p>
+		<p>
+			<?php if($stage['lives']['boss'] > 0) : ?>
+			<?php foreach(range(1,$stage['lives']['boss']) as $i) : ?>
+			<i class="fa fa-heart fa-fw"></i>
+			<?php endforeach ?>
+			<?php else : ?>
+			<?=_('lost')?>
+			<?php endif ?>
+		</p>
+	</section>
 </div>
 <?php endforeach ?>