fixed small issues with animation off on switch