Fix for failing batch test