OPS-1879: simpler