Fix for Issue #1799
Fix for Issue #1800
Merge pull request #1804 from markcowl/fix1800

Fix for issue #1800