Issue #36: May 22, 2025