fixes for exercise 2.8