#kd-1 Fixed