Fixed problem with namespaces