Fixed batch rebuilding