Question 1 - bug fixed