Fix lifecycle issue and applied to trigger