Fix compatibility with L5