Fixed issue with wrong DependencyLifecycle