Change to right thing