WIP: fix bug for lls version