fix bad merge from autoupdate branch