Fix goal achievement