Fix for Issue #930
Merge pull request #981 from rafalchmiel/patch-1

Fix for Issue #930