[BUGFIX] General NameSpace issue