ensure valid address
made it use capture
made it use capture fixture fix