Fix perfomance issue