goTo fix #2