performance fix batch 2