Preformance fix