Bug fix on Lqi management