Fix SMP issue in DD 1.6.4