Fix for lifetime elision