Some Fix Bug