Fixed #722