fix, part 2