fixes for exercise 2.7