Commit of Gerardo's Fix to Score