Merge pull request #993 from narfbg/develop-issue-128

Fix issue #128