HOTFIX for IAIS-24