ProcessGoal fix (not finished yet)