Fixed service switching (thanks Jonty)