Originally addressed [here](https://github.com/blockblaz/zeam/pull/368#pullrequestreview-3614577865) by @g11tech