Couple of bugs in Goal Statistics