Fix #6 in the right place.