Bugs 57 and 58 follow up