Fixing Bugs part 3