Fixed exercise 2