Fix bulk export