some problem fixed