fixes for exercise 2.6