voltage control fix merge