fixed some problem