fixed-bugs-in-namespace