Another stability fix for DnD