Fix spell and switch