fix goto bug