Fix #698