Another fix attempt Part 2