Fixed #801