Merge pull request #1089 from narfbg/develop-issue-177

Fix issue #177