Fixed #721