Fix driver next/previous switching