Switch to new headphone fix