fixed bug with switchy