Fixed exercise 1.21