#performance fix