Fixed batch for real, also logging