Testing performance fix