BugFix on class namespace