Bulk dispose fix