Bug fix for namespace resolution.