Switch View Fix