Multiple namespaces fixed (partially)