Fix #4 but not #25.