Edition - Fix issue w/ d&d