improvement: more predictable DnD behaviour