Fix #8 again.