Fixed switch again now it should keep working