Fix code (part 2)