Additional fix for namespace.