Hotfix for scalding bug