I always click completion instead of goal. I don't know if it is possible to have Goal be a specific type of completion and still be able to do the calculations, but for me that work-flow (click-flow?) makes more sense. This could also just be a me thing.