Adapt to the new version of llama
