Fix the right thing