Fix: Lifecycle Method