Fixed #719