Issue #21628: Corrected issue with static collection