fix current control bug introduced by refactor
Merge pull request #462 from wolfmanjm/upstreamedge

fix current control bug introduced by refactor