Fixed #780