fixed logic and go link