Fix Bug Commit Charles