Fix #1548
Merge pull request #1565 from AnalyticalGraphicsInc/issue1548

Fix #1548