Fix tank switching, again.