performace fix