Fix live hook lifecycle