Fix #607