fixed some problem
fixed some problem