Fixed lifetime issue