Fix new version goto (uses an explicit label)