Fixed #785