Fix goal bug