Fixed some problem