Fix in GoTo