Update Issue #524