related to #707