Fixing batch() feature