fix for Issue #240