fix the ~6% performance leak