Fix #672