bug 8 follow up
bug 8 follow up