quick hack to support namespaces