perfomance fix