Had bpaddr and bpval reversed in last comit.