Bug 76 follow up