Fix for an Issue #524