BugFix GoTo Function