Fixed performance problem.