Trying a fix of
https://github.com/CartoonCraft/uhc/commit/c34db872813612c6b4d7c84a72a241c0f7ca9856