comment autoupdate lock causing issue on rebuild