self-fix part 2