Fixed #793