Fix perfomance