Fixed #790