Bug 38 follow up