Fix tank switching, part 3.