OPS-1636: more flexible