Fixed switch issue