Fixed goTo method