Fix #687