bug 2915 followup - small efficiency improvement