K-L bug fix