Fixed the "rebuild" failure issue