Fix #682