diff --git a/src/main/kotlin/components/questiondialog/QuestionDialogContent.kt b/src/main/kotlin/components/questiondialog/QuestionDialogContent.kt
index 835a05f..47f3d93 100644
--- a/src/main/kotlin/components/questiondialog/QuestionDialogContent.kt
+++ b/src/main/kotlin/components/questiondialog/QuestionDialogContent.kt
@@ -56,7 +56,9 @@ fun QuestionDialogContent(
                             onPointsChange = onPointsChange,
                             questionPoints = questionData.actualUsagePoints(secondRoundDouble).toLong(),
                             onQuestionDone = { showAnswer = true },
-                            onQuestionAnswered = { questionAnswered = QuestionResolution(true, it) }
+                            onQuestionAnswered = {
+                                questionAnswered = QuestionResolution(true, it)
+                            }
                         )
                     } else {
                         QuestionDialogPlayer(
@@ -79,7 +81,7 @@ fun QuestionDialogContent(
                 onResolve = {
                     if (showAnswer) {
                         onResolve(
-                            QuestionResolution(true, null)
+                            QuestionResolution(true, questionAnswered.player)
                         )
                     } else {
                         showAnswer = true