Fix some Bug