Removed reference to batch in object switches
Merge pull request #1 from tomalterman/fix/vars

Removed reference to batch in object switches