Fixed the performance