Performace fix