Fix #25 but not #4.