Fix for problem 1 + problem 13