bug 23 follow up