Supplemental changes for Fix3673.
Merge pull request #180 from AndrejMitrovic/Fix3673

Supplemental changes for Fix3673.