Scoreboard handler fix