lifecycle subscriber fix