diff --git a/Models/QAAnswerMapper.php b/Models/QAAnswerMapper.php
index 5371463..ae90825 100644
--- a/Models/QAAnswerMapper.php
+++ b/Models/QAAnswerMapper.php
@@ -46,7 +46,7 @@ class QAAnswerMapper extends DataMapperAbstract
         'qa_answer_answer'    => ['name' => 'qa_answer_answer', 'type' => 'string', 'internal' => 'answer'],
         'qa_answer_question'    => ['name' => 'qa_answer_question', 'type' => 'int', 'internal' => 'question'],
         'qa_answer_status'  => ['name' => 'qa_answer_status', 'type' => 'int', 'internal' => 'status'],
-        'qa_answer_accepted'  => ['name' => 'qa_answer_accepted', 'type' => 'int', 'internal' => 'isAccepted'],
+        'qa_answer_accepted'  => ['name' => 'qa_answer_accepted', 'type' => 'bool', 'internal' => 'isAccepted'],
         'qa_answer_created_by' => ['name' => 'qa_answer_created_by', 'type' => 'int', 'internal' => 'createdBy'],
         'qa_answer_created_at' => ['name' => 'qa_answer_created_at', 'type' => 'DateTime', 'internal' => 'createdAt'],
     ];
diff --git a/Models/QAQuestionMapper.php b/Models/QAQuestionMapper.php
index 120867b..a25f51e 100644
--- a/Models/QAQuestionMapper.php
+++ b/Models/QAQuestionMapper.php
@@ -62,8 +62,8 @@ class QAQuestionMapper extends DataMapperAbstract
         'badges' => [
             'mapper'         => QABadgeMapper::class,
             'table'          => 'qa_question_badge',
-            'dst'            => 'qa_question_badge_badge',
-            'src'            => 'qa_question_badge_question',
+            'src'            => 'qa_question_badge_badge',
+            'dst'            => 'qa_question_badge_question',
         ],
         'answers' => [
             'mapper'         => QAAnswerMapper::class,