Lifecycle fixed