bug 22 follow up