Fixes switches even more