Rectified that hopper fix being very incomplete (and unit test breaking!).