fixed livelock issue introduced by 063ec2920d21
fixed initialization issue caused by 063ec2920d21