#kds - fixes