Fix switching geometry with Path display on