Fix on geometry recovery