fix lifecycle