Fix #674