diff --git a/xpp/perl_modules/Dahdi/Chans.pm b/xpp/perl_modules/Dahdi/Chans.pm
index a869ae4..e045c7d 100644
--- a/xpp/perl_modules/Dahdi/Chans.pm
+++ b/xpp/perl_modules/Dahdi/Chans.pm
@@ -229,7 +229,7 @@ sub battery($) {
 	return undef unless defined $self->type && $self->type eq 'FXO';
 	return $self->{BATTERY} if defined $self->{BATTERY};
 
-	my $xpd = $span->xpd;
+	my $xpd = Dahdi::Xpp::xpd_of_span($span);
 	my $index = $self->index;
 	return undef if !$xpd;
 
@@ -251,7 +251,7 @@ sub blink($$) {
 	my $on = shift;
 	my $span = $self->span or die;
 
-	my $xpd = $span->xpd;
+	my $xpd = Dahdi::Xpp::xpd_of_span($span);
 	my $index = $self->index;
 	return undef if !$xpd;
 
diff --git a/xpp/perl_modules/Dahdi/Config/Gen/System.pm b/xpp/perl_modules/Dahdi/Config/Gen/System.pm
index 94fbf2b..cb7b14b 100644
--- a/xpp/perl_modules/Dahdi/Config/Gen/System.pm
+++ b/xpp/perl_modules/Dahdi/Config/Gen/System.pm
@@ -137,7 +137,7 @@ sub gen_digital($$$) {
 	if ($span->is_bri()) {
 		my $use_bristuff = 0;
 		my $cfg_hardhdlc = $gconfig->{'bri_hardhdlc'};
-		my $xpd = $span->xpd();
+		my $xpd = Dahdi::Xpp::xpd_of_span($span);
 		if(!defined($cfg_hardhdlc) || $cfg_hardhdlc =~ /AUTO/i) {
 			# Autodetect
 			if(defined($xpd)) {