Fixes #5517
Fixes #5515
Merge pull request #5526 from Incoming5643/whydidItouchgamemodecode

I must have been really tired when I wrote #4846