Fix issue with batch imports