Fix ~10% performance degradation