Merge pull request #2277 from valentinewallace/2023-05-fix-big-oms