[FIX] Namespaces issue