This should now work correctly
Hopefully fixed the annoying bug and removed a pointless gag