Additional fix for handling namespaces.