Little bug with new check_switch function was fixed.