Another attempt to fix Issue #269