Fix #675