some BugFix