Fix Lifecycle Issue