bug #16 follow up