Fixed #769