Fix for Issue #283