[BUGFIX] Fix namespace issue