Fix #691