Fix for Issue #298