[wip/ticket/12413-3] using min and not %