partial fix for issue #2261
Merge pull request #2262 from jpuri/master

partial fix for issue #2261