Fix goal code