Untested scoreboard fix attempt