#KD-1 fixed