Fix of Problem 1