Another attempt to fix the livetime issue