fix posible perfomance issue