#7, fix for bulk operations.