370.06 Fixes switch setting bug