Fix #685