Lifecycle Subscriber bug fix