Fix for Issue #237
Fix for Issue #326