Fix for Issue #250
merging
Merge pull request #2151 from markcowl/bug2150

Fic for Issue #2150
merging2