additional changes to fix issue #1458
Merge pull request #1459 from morphace/master

Additional changes related to issue #1458