Fix start and switch