More corrections re issue #1425
Merge pull request #2529 from chrisdev/master

Address issue #1425