More perfomance fixing