Lifecycle hotfix