Minor BugFix2