Fix goal completion