Fix #728