FIX: Performance degradation from previous version