Fix #655