Perfomance fix