Fixed the answer to Question 1