added check for BatchSubstitute