fix for Issue 1479
Fix the fix for Issue #1479
Merge pull request #1534 from gberenfield/master

Tested fix for Issue #1479