Fix #680