Fixes #2678

This has been done while waiting on a train so i'm not in a position to test it or hear what the sounds are like but I'll do that later to make sure stuff won't break compile/ears.

I don't know while crowbar_red is saying it's been changed. Probably just wants the attention.