Fix for Issue #235