fixes for exercise 2.4