fixed some problem.