Fix #670