Fix the fixer
Add more, better debug