Bug 34 follow up