Maybe we should think about bundling those 2 functions in the util-package?