Performance error fix