Fixed Battery/Pack to index from 1, not 0.