perfomence fix