FIx for Issue #301