fixed goal picking
...