#6 tentative performance fix