WC-453 #comment Huge bugfix, DnD creating