Fix master score calculation