Another attempted scoreboard fix. :( FAIL