Fixed #743