Fix #684