Fix #608 again.