Fixed a 'double namespace' issue