HOTFIX: Possible hotfix for IncompatibleClassChangeError