#kd-9 fixed