Fix #660