Merge pull request #906 from narfbg/develop-issue-904

Fix issue #904