Fix #949
Merge pull request #958 from naparuba/BugFix-#949

Fix #949