Fixed 3rd problem