Tested fix for Issue #1479

Sorry for the confusion, this has been tested and works.