diff --git a/src/main/java/org/bitbiome/commands/QuizCommand.java b/src/main/java/org/bitbiome/commands/QuizCommand.java
index 241917d..0088a6b 100644
--- a/src/main/java/org/bitbiome/commands/QuizCommand.java
+++ b/src/main/java/org/bitbiome/commands/QuizCommand.java
@@ -34,7 +34,7 @@ public class QuizCommand implements CommandAPI {
         int eingabe = quizScanner.nextInt();
         String korrekteAntwort = frage.getString("korrekteAntwort");
 
-        if (antworten.getString(eingabe - 1).equalsIgnoreCase(korrekteAntwort)) {
+        if (answerIsCorrect(eingabe, korrekteAntwort, antworten)) {
             System.out.println("Richtige Antwort!\n");
         } else {
             System.out.println("Leider falsch... Richtig ist: " + korrekteAntwort + "\n");
@@ -42,6 +42,10 @@ public class QuizCommand implements CommandAPI {
 
         System.out.println("Das Quiz ist vorbei.");
     }
+
+    public static boolean answerIsCorrect(int picked, String answer, JSONArray answers) {
+        return answers.getString(picked - 1).equalsIgnoreCase(answer);
+    }
 }