Bug 88 follow up