fix current control bug introduced by refactor