Fixed some Bug