fix some bug,
modify the order of system restore cb