Fix #693