Attempted more fixing (no avail)