fix for redmine #2635
Merge pull request #662 from jeffali/fix/2635

fix for redmine #2635