fixingBugs