fix #923
Merge pull request #932 from remcoros/issue-923

fix #923