Try to fix namespaces