Fix #665