Fixing Bugs part 4