Fix #607

Fix #607