Merge pull request #1040 from narfbg/develop-issue-1039

Fix issue #1039