Bug's Fixed