See if this fixes address not being reusable