Fix of issue with namespaces