bug fix && curl mode in rebuild method