Merge goTo fix