This fixes a drastic error with the mainwads++ fix from earlier, so I'm gonna bend the rules a bit and merge ASAP even though it only has +1.
merged
mentioned in commit 50a6df75
mentioned in merge request !317 (merged)
