Fixed #783