Issue785

Fix #785