Fix #661