Revert "Revert "Fix Dracon's 2nd epic fail""

This reverts commit 136be8c037130b01e5fc310e100204a0a2f6617e.