fixes for exercise 2.9