bug fix round2.