Fixed the annoying lifetime issue