Release the old made fix for Scoreboard Exception
Refactored a little bit