Add back batch loading after previous fix