initial performance fix