Follow up to #729 .
Follow up to #729 .