Kc compatibility fix