some performance fix