Fix #686