Fix Bug Issues