Fixed #813