Fix for Issue #234
Fix for Issue #243