Corresponding fix to exercise 23 for solutions.