diff --git a/client/BUILD/a2pi.wdc.s b/client/BUILD/a2pi.wdc.s
index 383cc85..2aa03f0 100755
--- a/client/BUILD/a2pi.wdc.s
+++ b/client/BUILD/a2pi.wdc.s
@@ -262,18 +262,22 @@ SENDACC	PHP
 	SEI		; Disable interrupts
 	PHA
 	LDA	SSCSLOT
-	ORA	#$88+1
+	ORA	#$89+1
 	TAY
 	LDA	#$07
-	STA	$C002-1,Y	; Enable transmit IRQ
-	LDA	$C001-1,Y	; Clear any oustanding interrupts
+	STA	$C002-2,Y	; Enable transmit IRQ
+	LDA	$C001-2,Y	; Clear any oustanding interrupts
 	PLA
-	STA	$C000-1,Y	; AVOID PHANTOM READ FROM $C0XX
-SENDWT	LDA	$C001-1,Y
+	STA	$C000-2,Y	; AVOID PHANTOM READ FROM $C0XX
+	PHA
+SENDWT	LDA	$C001-2,Y
 ;	AND	#$80	; Check IRQ status
 	BPL	SENDWT
 	LDA	#$0B	; Disable transmit IRQ
-	STA	$C002-1,Y
+	STA	$C002-2,Y
+IRQWT	LDA	$C001-2,Y	; Wait for IRQ to clear
+	BMI	IRQWT
+	PLA
 	PLP		; Restore interrupts
 	RTS
 *
@@ -282,7 +286,7 @@ SENDWT	LDA	$C001-1,Y
 RECVACC	LDA	SSCSLOT
 	ORA	#$89+1
 	TAY
-RECVWT	LDA	$C000-1,Y
+RECVWT	LDA	$C001-2,Y
 	AND	#$08
 	BEQ	RECVWT
 	LDA	$C000-2,Y
diff --git a/client/BUILD/a2pluspi.wdc.s b/client/BUILD/a2pluspi.wdc.s
index c530e6d..4f280b8 100755
--- a/client/BUILD/a2pluspi.wdc.s
+++ b/client/BUILD/a2pluspi.wdc.s
@@ -231,18 +231,22 @@ SENDACC	PHP
 	SEI		; Disable interrupts
 	PHA
 	LDA	SSCSLOT
-	ORA	#$88+1
+	ORA	#$89+1
 	TAY
 	LDA	#$07
-	STA	$C002-1,Y	; Enable transmit IRQ
-	LDA	$C001-1,Y	; Clear any oustanding interrupts
+	STA	$C002-2,Y	; Enable transmit IRQ
+	LDA	$C001-2,Y	; Clear any oustanding interrupts
 	PLA
-	STA	$C000-1,Y	; AVOID PHANTOM READ FROM $C0XX
-SENDWT	LDA	$C001-1,Y
+	STA	$C000-2,Y	; AVOID PHANTOM READ FROM $C0XX
+	PHA
+SENDWT	LDA	$C001-2,Y
 ;	AND	#$80	; Check IRQ status
 	BPL	SENDWT
 	LDA	#$0B	; Disable transmit IRQ
-	STA	$C002-1,Y
+	STA	$C002-2,Y
+IRQWT	LDA	$C001-2,Y	; Wait for IRQ to clear
+	BMI	IRQWT
+	PLA
 	PLP		; Restore interrupts
 	RTS
 *
@@ -251,7 +255,7 @@ SENDWT	LDA	$C001-1,Y
 RECVACC	LDA	SSCSLOT
 	ORA	#$89+1
 	TAY
-RECVWT	LDA	$C000-1,Y
+RECVWT	LDA	$C001-2,Y
 	AND	#$08
 	BEQ	RECVWT
 	LDA	$C000-2,Y
diff --git a/share/A2PI-WDC.1.7.PO b/share/A2PI-WDC.1.7.PO
index 2281852..59fd712 100644
Binary files a/share/A2PI-WDC.1.7.PO and b/share/A2PI-WDC.1.7.PO differ