fixes to pull request 710