Merge pull request #1072 from narfbg/develop-issue-1070

Fix issue #1070