v. 0.3.4, optimise oneOff handling