Fixed wrong answer
Merge branch 'hotfix_wrong_answer' into development