BugFix on GUI