Hotfix on doing_action not present on some versions