fix perfomance