fix #700
Merge pull request #771 from dannycoates/i700-2

fix #700