bug 24 follow up