Shell fix reapplied at Thu May 14 09:19:02 EDT 2026