Fix for Issue #1349
Merge pull request #1351 from akallabeth/master

Fix for Issue #1349