bug 2801 followup