Fix for #1804
Fix for #1804
Merge pull request #1810 from adonath/Fix_for_#1804

Fix for #1804