helper/schema: sets properly take into account the diff