Fix bug in challenge 13
Merge branch 'hotfix/fix-bugs'