Fix for problem solving 1