Fixed #777