Added change included in Pull Request # 1718

Added change made by dominic wand included in Pull Request # 1718