[BUGFIX] Fixed fixing of namespaces