Bug fix goTo