fixes #707
Merge branch 'pr708'