Fix #696